diff options
| author | Sérgio Martins <sergio.martins@kdab.com> | 2014-12-10 13:42:45 +0000 |
|---|---|---|
| committer | Sérgio Martins <sergio.martins@kdab.com> | 2015-08-14 23:34:26 +0000 |
| commit | 385202c27caa070e07eba098a1b968f9d466aaad (patch) | |
| tree | b1a5d3ddcbe8b5d2a656c5f6ee0f10714fb2e037 /src/platformsupport/fontdatabases | |
| parent | ea3e2ca6ea465157293bdf45046ed23f8f83d1dc (diff) | |
OSX FreeType: Add support for sub pixel font rendering.
Task-number: QTBUG-42839
Change-Id: Iea4552d766936a55fd177e4287591d2715202d9c
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
Diffstat (limited to 'src/platformsupport/fontdatabases')
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm index 4c9c7b78db..1f000421cc 100644 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm @@ -986,10 +986,20 @@ QFontEngine *QCoreTextFontDatabase::freeTypeFontEngine(const QFontDef &fontDef, QFontEngine::FaceId faceId; faceId.filename = filename; const bool antialias = !(fontDef.styleStrategy & QFont::NoAntialias); - const QFontEngineFT::GlyphFormat format = antialias ? QFontEngineFT::Format_A8 - : QFontEngineFT::Format_Mono; QScopedPointer<QFontEngineFT> engine(new QFontEngineFT(fontDef)); + QFontEngineFT::GlyphFormat format = QFontEngineFT::Format_Mono; + if (antialias) { + QFontEngine::SubpixelAntialiasingType subpixelType = subpixelAntialiasingTypeHint(); + if (subpixelType == QFontEngine::Subpixel_None || (fontDef.styleStrategy & QFont::NoSubpixelAntialias)) { + format = QFontEngineFT::Format_A8; + engine->subpixelType = QFontEngine::Subpixel_None; + } else { + format = QFontEngineFT::Format_A32; + engine->subpixelType = subpixelType; + } + } + if (!engine->init(faceId, antialias, format, fontData) || engine->invalid()) { qWarning() << "QCoreTextFontDatabase::freeTypefontEngine Failed to create engine"; return Q_NULLPTR; |