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

Fix text issues when using typographic names

Browse Source 
By default, only the legacy family names are populated on Windows,
since we are using GDI to do the population.

The actual typographic names are added later as aliases when
the font is loaded.

This can cause us to fail matching a font against its typographic
name before it has been loaded and e.g .in Qt Quick we will cache
the glyph indexes for a fallback font instead. If the font is later
loaded and aliases are populated, we will use the cached glyph
indexes and get seemingly random glyphs displayed.

We reuse the mechanism invented for CoreText to do lazy population
of aliases. The population will now happen when the first non-match
occurs, and a second attempt will be made after we populate aliases.

[ChangeLog][Windows] Fixes an issue where fonts would sometimes not
fail to work when selected using typographic names.

Fixes: QTBUG-84786
Pick-to: 5.15
Change-Id: Ic7b65cde26ddcbf1a257f1673b9af37154660c2f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2020-08-27 11:54:05 +02:00
parent 707b64bece
commit cba147d359
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/text/windows/qwindowsfontdatabase.cpp
View File

@ -651,6 +651,21 @@ static int QT_WIN_CALLBACK storeFont(const LOGFONT *logFont, const TEXTMETRIC *t
return 1;
}
bool QWindowsFontDatabase::populateFamilyAliases(const QString &missingFamily)
{
Q_UNUSED(missingFamily);
if (m_hasPopulatedAliases)
return false;
QStringList families = QFontDatabase::families();
for (const QString &family : families)
populateFamily(family);
m_hasPopulatedAliases = true;
return true;
}
void QWindowsFontDatabase::populateFamily(const QString &familyName)
{
qCDebug(lcQpaFonts) << familyName;

2
src/gui/text/windows/qwindowsfontdatabase_p.h
View File

@ -80,6 +80,7 @@ public:
void populateFontDatabase() override;
void populateFamily(const QString &familyName) override;
bool populateFamilyAliases(const QString &missingFamily) override;
QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) override;
QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) override;
QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const override;
@ -126,6 +127,7 @@ private:
static unsigned m_fontOptions;
QStringList m_eudcFonts;
bool m_hasPopulatedAliases = false;
};
#ifndef QT_NO_DEBUG_STREAM