diff options
| -rw-r--r-- | src/gui/text/windows/qwindowsfontdatabase.cpp | 3 | ||||
| -rw-r--r-- | src/gui/text/windows/qwindowsfontenginedirectwrite.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/text/windows/qwindowsfontdatabase.cpp b/src/gui/text/windows/qwindowsfontdatabase.cpp index 0d84475049..7f7dada056 100644 --- a/src/gui/text/windows/qwindowsfontdatabase.cpp +++ b/src/gui/text/windows/qwindowsfontdatabase.cpp @@ -1257,9 +1257,6 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request, const Q QFontDef fontDef = request; fontDef.families = QStringList(QString::fromWCharArray(n)); - - if (isColorFont) - fedw->glyphFormat = QFontEngine::Format_ARGB; fedw->initFontInfo(fontDef, dpi); fe = fedw; } diff --git a/src/gui/text/windows/qwindowsfontenginedirectwrite.cpp b/src/gui/text/windows/qwindowsfontenginedirectwrite.cpp index 36773221b9..04a7a44f27 100644 --- a/src/gui/text/windows/qwindowsfontenginedirectwrite.cpp +++ b/src/gui/text/windows/qwindowsfontenginedirectwrite.cpp @@ -1033,6 +1033,10 @@ void QWindowsFontEngineDirectWrite::initFontInfo(const QFontDef &request, names->Release(); } + // Color font + if (face3->GetPaletteEntryCount() > 0) + glyphFormat = QFontEngine::Format_ARGB; + face3->Release(); } #endif |