diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-02-06 12:14:48 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-02-07 08:54:11 +0100 |
| commit | 31911d387b4b06725241543d3298b9b2549b397c (patch) | |
| tree | f8b246344e6163b08864ac8f6990004cb0941040 /src/platformsupport/fontdatabases | |
| parent | 4c4b5a97c3167b405faab2cc3f3fb38408374df2 (diff) | |
DirectWrite font db: Fix unstretched font selection
A typo in the conversion between DirectWrite stretch and Qt stretch
caused all unstretched fonts to be registered as ultra-condensed.
Change-Id: I2ec64fcef44cc6259946b761a7bfac0ce191971e
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/platformsupport/fontdatabases')
| -rw-r--r-- | src/platformsupport/fontdatabases/windows/qwindowsdirectwritefontdatabase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsdirectwritefontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsdirectwritefontdatabase.cpp index 037ae3944e..5a1ff935b8 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsdirectwritefontdatabase.cpp +++ b/src/platformsupport/fontdatabases/windows/qwindowsdirectwritefontdatabase.cpp @@ -85,7 +85,7 @@ static QFont::Stretch fromDirectWriteStretch(DWRITE_FONT_STRETCH stretch) case DWRITE_FONT_STRETCH_EXTRA_CONDENSED: return QFont::ExtraCondensed; case DWRITE_FONT_STRETCH_CONDENSED: return QFont::Condensed; case DWRITE_FONT_STRETCH_SEMI_CONDENSED: return QFont::SemiCondensed; - case DWRITE_FONT_STRETCH_NORMAL: return QFont::UltraCondensed; + case DWRITE_FONT_STRETCH_NORMAL: return QFont::Unstretched; case DWRITE_FONT_STRETCH_SEMI_EXPANDED: return QFont::SemiExpanded; case DWRITE_FONT_STRETCH_EXPANDED: return QFont::Expanded; case DWRITE_FONT_STRETCH_EXTRA_EXPANDED: return QFont::ExtraExpanded; |