From 31911d387b4b06725241543d3298b9b2549b397c Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 6 Feb 2020 12:14:48 +0100 Subject: DirectWrite font db: Fix unstretched font selection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../fontdatabases/windows/qwindowsdirectwritefontdatabase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- cgit v1.2.3