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

DirectWrite: Fetch correct style name in font info

Browse Source 
When getting the font info for a resolved QFont on DirectWrite,
the style name would not be set, so there would be no way to
check the style name of the actual resolved font.

Change-Id: I5ff27e95619a330b7d2a0252222fad8629837418
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2023-10-02 12:29:07 +02:00
parent d4e5898ba0
commit 0138d910b2
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/text/windows/qwindowsdirectwritefontdatabase_p.h
View File

@ -49,6 +49,7 @@ public:
bool isPrivateFontFamily(const QString &family) const override; bool isPrivateFontFamily(const QString &family) const override;
private: private:
friend class QWindowsFontEngineDirectWrite;
static QString localeString(IDWriteLocalizedStrings *names, wchar_t localeName[]); static QString localeString(IDWriteLocalizedStrings *names, wchar_t localeName[]);
QHash<QString, IDWriteFontFamily *> m_populatedFonts; QHash<QString, IDWriteFontFamily *> m_populatedFonts;

22
src/gui/text/windows/qwindowsfontenginedirectwrite.cpp
View File

@ -15,7 +15,12 @@
#include <QtGui/private/qhighdpiscaling_p.h> #include <QtGui/private/qhighdpiscaling_p.h>
#include <QtGui/qpainterpath.h> #include <QtGui/qpainterpath.h>
#include <dwrite_2.h> #if QT_CONFIG(directwrite3)
# include "qwindowsdirectwritefontdatabase_p.h"
# include <dwrite_3.h>
#else
# include <dwrite_2.h>
#endif
#include <d2d1.h> #include <d2d1.h>
@ -1009,6 +1014,21 @@ void QWindowsFontEngineDirectWrite::initFontInfo(const QFontDef &request,
fontDef.pointSize = fontDef.pixelSize * 72. / dpi; fontDef.pointSize = fontDef.pixelSize * 72. / dpi;
else if (fontDef.pixelSize == -1) else if (fontDef.pixelSize == -1)
fontDef.pixelSize = qRound(fontDef.pointSize * dpi / 72.); fontDef.pixelSize = qRound(fontDef.pointSize * dpi / 72.);
#if QT_CONFIG(directwrite3)
IDWriteFontFace3 *face3 = nullptr;
if (SUCCEEDED(m_directWriteFontFace->QueryInterface(__uuidof(IDWriteFontFace3),
reinterpret_cast<void **>(&face3)))) {
IDWriteLocalizedStrings *names;
if (SUCCEEDED(face3->GetFaceNames(&names))) {
wchar_t englishLocale[] = L"en-us";
fontDef.styleName = QWindowsDirectWriteFontDatabase::localeString(names, englishLocale);
names->Release();
}
face3->Release();
}
#endif
} }
QString QWindowsFontEngineDirectWrite::fontNameSubstitute(const QString &familyName) QString QWindowsFontEngineDirectWrite::fontNameSubstitute(const QString &familyName)