1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QIcon: harden font file discovery in Android icon engine

Browse Source 
Amend f54393ba70d6dc56b201cf8ff7691a4bf04626d6 by trying more font file
candidates, and don't try to download fonts if the query is pointing at
a resource.

Change-Id: I3fffc6fb3faa45b95540ebdf6cdf8ee4a49ebd78
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Volker Hilsheimer 2023-12-08 13:54:55 +01:00
parent 2bc7d38bd6
commit 1c42b1e8c7
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/platforms/android/qandroidplatformiconengine.cpp
View File

@ -59,7 +59,7 @@ static QString fetchFont(const QString &query)
const QByteArray fontData = file.readAll(); const QByteArray fontData = file.readAll();
int fontId = QFontDatabase::addApplicationFontFromData(fontData); int fontId = QFontDatabase::addApplicationFontFromData(fontData);
loadedFamilies << QFontDatabase::applicationFontFamilies(fontId); loadedFamilies << QFontDatabase::applicationFontFamilies(fontId);
} else { } else if (!query.startsWith(u":/"_s)) {
const QString package = u"com.google.android.gms"_s; const QString package = u"com.google.android.gms"_s;
const QString authority = u"com.google.android.gms.fonts"_s; const QString authority = u"com.google.android.gms.fonts"_s;
@ -250,17 +250,33 @@ QAndroidPlatformIconEngine::QAndroidPlatformIconEngine(const QString &iconName)
: m_iconName(iconName) : m_iconName(iconName)
, m_glyphs(glyphs()) , m_glyphs(glyphs())
{ {
// The MaterialIcons-Regular.ttf font file is available from QString fontFamily;
// https://github.com/google/material-design-icons/tree/master/font. If it's packaged // The MaterialIcons-*.ttf and MaterialSymbols* font files are available from
// as a resource with the application, then we use it. Otherwise we try to download // https://github.com/google/material-design-icons/tree/master. If one of them is
// the Outlined version of Material Symbols, and failing that we try Material Icons. // packaged as a resource with the application, then we use it. We prioritize
QString fontFamily = FontProvider::fetchFont(u":/qt-project.org/icons/MaterialIcons-Regular.ttf"_s); // a variable font.
const QStringList fontCandidates = {
"MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].ttf",
"MaterialSymbolsRounded[FILL,GRAD,opsz,wght].ttf",
"MaterialSymbolsSharp[FILL,GRAD,opsz,wght].ttf",
"MaterialIcons-Regular.ttf",
"MaterialIconsOutlined-Regular.otf",
"MaterialIconsRound-Regular.otf",
"MaterialIconsSharp-Regular.otf",
"MaterialIconsTwoTone-Regular.otf",
};
for (const auto &fontCandidate : fontCandidates) {
fontFamily = FontProvider::fetchFont(u":/qt-project.org/icons/%1"_s.arg(fontCandidate));
if (!fontFamily.isEmpty())
break;
}
// Otherwise we try to download the Outlined version of Material Symbols
const QString key = qEnvironmentVariable("QT_GOOGLE_FONTS_KEY"); const QString key = qEnvironmentVariable("QT_GOOGLE_FONTS_KEY");
if (fontFamily.isEmpty() && !key.isEmpty()) if (fontFamily.isEmpty() && !key.isEmpty())
fontFamily = FontProvider::fetchFont(u"key=%1&name=Material+Symbols+Outlined"_s.arg(key)); fontFamily = FontProvider::fetchFont(u"key=%1&name=Material+Symbols+Outlined"_s.arg(key));
// last resort - use the old Material Icons // last resort - use any Material Icons
if (fontFamily.isEmpty()) if (fontFamily.isEmpty())
fontFamily = u"Material Icons"_s; fontFamily = u"Material Icons"_s;
m_iconFont = QFont(fontFamily); m_iconFont = QFont(fontFamily);