whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QFontDatabase: Move registration of platform application fonts into call sites 

Makes it more transparent what's going on, rather than the opaquely
named static helper function.

Change-Id: I9a5bd348007e9ed11214f1e55c4b39d4734328dc
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
bb10
Tor Arne Vestbø 2022-03-25 14:34:38 +01:00
parent 24f242a2f3
commit 6cbaf834a7
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/text/qfontdatabase.cpp
View File

@ -715,8 +715,6 @@ QStringList qt_fallbacksForFamily(const QString &family, QFont::Style style, QFo
return fallbacksForFamily(family, style, styleHint, script);
}
static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt);
QFontEngine *QFontDatabasePrivate::loadSingleEngine(int script,
const QFontDef &request,
QtFontFamily *family, QtFontFoundry *foundry,
@ -843,11 +841,6 @@ QtFontStyle::~QtFontStyle()
free(pixelSizes);
}
static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt)
{
QGuiApplicationPrivate::platformIntegration()->fontDatabase()->addApplicationFont(fnt->data, fnt->fileName, fnt);
}
static QtFontStyle *bestStyle(QtFontFoundry *foundry, const QtFontStyle::Key &styleKey,
const QString &styleName = QString())
{
@ -1300,10 +1293,13 @@ QFontDatabasePrivate *QFontDatabasePrivate::ensureFontDatabase()
if (Q_UNLIKELY(qGuiApp == nullptr || QGuiApplicationPrivate::platformIntegration() == nullptr))
qFatal("QFontDatabase: Must construct a QGuiApplication before accessing QFontDatabase");
QGuiApplicationPrivate::platformIntegration()->fontDatabase()->populateFontDatabase();
auto *platformFontDatabase = QGuiApplicationPrivate::platformIntegration()->fontDatabase();
platformFontDatabase->populateFontDatabase();
for (int i = 0; i < d->applicationFonts.count(); i++) {
if (!d->applicationFonts.at(i).properties.isEmpty())
registerFont(&d->applicationFonts[i]);
if (!d->applicationFonts.at(i).properties.isEmpty()) {
auto *font = &d->applicationFonts[i];
platformFontDatabase->addApplicationFont(font->data, font->fileName, font);
}
}
}
return d;
@ -2122,7 +2118,9 @@ int QFontDatabasePrivate::addAppFont(const QByteArray &fontData, const QString &
font.fileName = QLatin1String(":qmemoryfonts/") + QString::number(i);
bool wasEmpty = QFontDatabasePrivate::instance()->count == 0;
registerFont(&font);
auto *platformFontDatabase = QGuiApplicationPrivate::platformIntegration()->fontDatabase();
platformFontDatabase->addApplicationFont(font.data, font.fileName, &font);
if (font.properties.isEmpty())
return -1;