diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-11-24 06:53:23 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-02-12 10:05:27 +0000 |
| commit | 7997e56a2e5f35fa19da9ccb5dc89586882d951b (patch) | |
| tree | 0ee8f46ecc56ebf9813a9b1e80aded7e3264a9c6 /src/plugins/platforms/windows/qwindowsfontengine.cpp | |
| parent | 01203a94b567be144731a0c5236478e464a794d3 (diff) | |
[QWindowsFont*] Unify HFONT fallbacks
In case CreateFontIndirect() call fails, always fallback to a better
stock font provided by Windows (apparently, it is DEFAULT_GUI_FONT).
Change-Id: Ib78fe0d21ba4fccbba1152b81ed87c010e1220e0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsfontengine.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontengine.cpp b/src/plugins/platforms/windows/qwindowsfontengine.cpp index fad8d134fa..ca28b822e4 100644 --- a/src/plugins/platforms/windows/qwindowsfontengine.cpp +++ b/src/plugins/platforms/windows/qwindowsfontengine.cpp @@ -322,7 +322,7 @@ QWindowsFontEngine::~QWindowsFontEngine() free(widthCache); // make sure we aren't by accident still selected - SelectObject(m_fontEngineData->hdc, (HFONT)GetStockObject(SYSTEM_FONT)); + SelectObject(m_fontEngineData->hdc, QWindowsFontDatabase::systemFont()); if (!DeleteObject(hfont)) qErrnoWarning("%s: QFontEngineWin: failed to delete font...", __FUNCTION__); @@ -1363,7 +1363,7 @@ QFontEngine *QWindowsMultiFontEngine::loadEngine(int at) // reason HFONT hfont = CreateFontIndirect(&lf); if (hfont == 0) - hfont = (HFONT)GetStockObject(ANSI_VAR_FONT); + hfont = QWindowsFontDatabase::systemFont(); return new QWindowsFontEngine(fam, hfont, lf, data); } |