diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-11-24 13:46:28 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2014-12-09 03:31:09 +0100 |
| commit | 27894537abac388eac904a180a0107f8c007fcbc (patch) | |
| tree | 27e52490792959127f26fb0d38fa9b3818d3cbc1 /src/plugins/platforms/winrt | |
| parent | b7f0583f3157da5cb8a6d86af5a4b4f410847556 (diff) | |
Make more font databases report fontsAlwaysScalable()
DirectWrite and CoreText supports scaling of non-scalable fonts.
Change-Id: I910c6a35e3d94c31efa9b26dd89bcb027951ac99
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/winrt')
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtfontdatabase.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtfontdatabase.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtfontdatabase.cpp b/src/plugins/platforms/winrt/qwinrtfontdatabase.cpp index a41e5f8f38..5d6b077abd 100644 --- a/src/plugins/platforms/winrt/qwinrtfontdatabase.cpp +++ b/src/plugins/platforms/winrt/qwinrtfontdatabase.cpp @@ -80,6 +80,11 @@ QFont QWinRTFontDatabase::defaultFont() const return QFont(QStringLiteral("Segoe UI")); } +bool QWinRTFontDatabase::fontsAlwaysScalable() const +{ + return true; +} + void QWinRTFontDatabase::populateFontDatabase() { ComPtr<IDWriteFactory1> factory; diff --git a/src/plugins/platforms/winrt/qwinrtfontdatabase.h b/src/plugins/platforms/winrt/qwinrtfontdatabase.h index f0c4714911..cf8ed3b06a 100644 --- a/src/plugins/platforms/winrt/qwinrtfontdatabase.h +++ b/src/plugins/platforms/winrt/qwinrtfontdatabase.h @@ -53,9 +53,10 @@ class QWinRTFontDatabase : public QBasicFontDatabase { public: QString fontDir() const; - QFont defaultFont() const Q_DECL_OVERRIDE; #ifdef QT_WINRT_USE_DWRITE ~QWinRTFontDatabase(); + QFont defaultFont() const Q_DECL_OVERRIDE; + bool fontsAlwaysScalable() const Q_DECL_OVERRIDE; void populateFontDatabase() Q_DECL_OVERRIDE; void populateFamily(const QString &familyName) Q_DECL_OVERRIDE; QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) Q_DECL_OVERRIDE; |