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

[QWindowsFontDatabase] Move code around to improve readability

Browse Source 
Keep DirectWrite initialization code in a single place and
fallback to GDI implementation if DirectWrite initialization has failed.

Change-Id: I2da185dbc073c58a7ba47bae09957ecac877d712
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Konstantin Ritt 2015-02-16 13:02:17 +04:00
parent 4d54fe8d02
commit a2ebd502d4
1 changed files with 30 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
View File

@ -1682,13 +1682,7 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request,
int dpi, int dpi,
const QSharedPointer<QWindowsFontEngineData> &data) const QSharedPointer<QWindowsFontEngineData> &data)
{ {
#if !defined(QT_NO_DIRECTWRITE) QFontEngine *fe = 0;
bool useDirectWrite = (request.hintingPreference == QFont::PreferNoHinting)
|| (request.hintingPreference == QFont::PreferVerticalHinting);
IDWriteFont *directWriteFont = 0;
#else
bool useDirectWrite = false;
#endif
LOGFONT lf = fontDefToLOGFONT(request); LOGFONT lf = fontDefToLOGFONT(request);
const bool preferClearTypeAA = lf.lfQuality == CLEARTYPE_QUALITY; const bool preferClearTypeAA = lf.lfQuality == CLEARTYPE_QUALITY;
@ -1712,10 +1706,9 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request,
} }
#if !defined(QT_NO_DIRECTWRITE) #if !defined(QT_NO_DIRECTWRITE)
if (useDirectWrite) { bool useDirectWrite = (request.hintingPreference == QFont::PreferNoHinting)
// Default to false for DirectWrite (and re-enable once/if everything turns out okay) || (request.hintingPreference == QFont::PreferVerticalHinting);
useDirectWrite = false; if (useDirectWrite && initDirectWrite(data.data())) {
if (initDirectWrite(data.data())) {
const QString fam = QString::fromWCharArray(lf.lfFaceName); const QString fam = QString::fromWCharArray(lf.lfFaceName);
const QString nameSubstitute = QWindowsFontEngineDirectWrite::fontNameSubstitute(fam); const QString nameSubstitute = QWindowsFontEngineDirectWrite::fontNameSubstitute(fam);
if (nameSubstitute != fam) { if (nameSubstitute != fam) {
@ -1724,17 +1717,29 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request,
lf.lfFaceName[nameSubstituteLength] = 0; lf.lfFaceName[nameSubstituteLength] = 0;
} }
IDWriteFont *directWriteFont = 0;
HRESULT hr = data->directWriteGdiInterop->CreateFontFromLOGFONT(&lf, &directWriteFont); HRESULT hr = data->directWriteGdiInterop->CreateFontFromLOGFONT(&lf, &directWriteFont);
if (FAILED(hr)) if (FAILED(hr)) {
qErrnoWarning("%s: CreateFontFromLOGFONT failed", __FUNCTION__); qErrnoWarning("%s: CreateFontFromLOGFONT failed", __FUNCTION__);
else } else {
useDirectWrite = true; IDWriteFontFace *directWriteFontFace = NULL;
hr = directWriteFont->CreateFontFace(&directWriteFontFace);
if (FAILED(hr)) {
qErrnoWarning("%s: CreateFontFace failed", __FUNCTION__);
} else {
QWindowsFontEngineDirectWrite *fedw = new QWindowsFontEngineDirectWrite(directWriteFontFace,
request.pixelSize,
data);
fedw->initFontInfo(request, dpi, directWriteFont);
fe = fedw;
} }
}
#endif
QFontEngine *fe = 0; directWriteFont->Release();
if (!useDirectWrite) { }
}
#endif // QT_NO_DIRECTWRITE
if (!fe) {
QWindowsFontEngine *few = new QWindowsFontEngine(request.family, lf, data); QWindowsFontEngine *few = new QWindowsFontEngine(request.family, lf, data);
if (preferClearTypeAA) if (preferClearTypeAA)
few->glyphFormat = QFontEngine::Format_A32; few->glyphFormat = QFontEngine::Format_A32;
@ -1742,25 +1747,6 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request,
fe = few; fe = few;
} }
#if !defined(QT_NO_DIRECTWRITE)
else {
IDWriteFontFace *directWriteFontFace = NULL;
HRESULT hr = directWriteFont->CreateFontFace(&directWriteFontFace);
if (SUCCEEDED(hr)) {
QWindowsFontEngineDirectWrite *fedw = new QWindowsFontEngineDirectWrite(directWriteFontFace,
request.pixelSize,
data);
fedw->initFontInfo(request, dpi, directWriteFont);
fe = fedw;
} else {
qErrnoWarning("%s: CreateFontFace failed", __FUNCTION__);
}
directWriteFont->Release();
}
#endif
return fe; return fe;
} }