diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-10-21 10:50:28 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2014-10-24 08:19:24 +0200 |
| commit | 3272ef4aaf14b72e0bab4698e4ad40b76a3d23d9 (patch) | |
| tree | c88d36890baab35c6213c029d9e0cddd27d21713 | |
| parent | 624740cdcdd4abfb15bbbc8a8aa056c57712499f (diff) | |
Respect NoSubpixelAntialias in QCoreTextFontEngine::imageForGlyph
Adding handling of the new QFont enum NoSubpixelAntialias in
QCoreTextFontEngine::imageForGlyph.
Task-number: QTBUG-40396
Change-Id: I421c38554360f5e2f822a18117190456c4d04b25
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm index f96163fc5b..2859886d59 100644 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm @@ -577,9 +577,10 @@ QImage QCoreTextFontEngine::imageForGlyph(glyph_t glyph, QFixed subPixelPosition cgflags); Q_ASSERT(ctx); CGContextSetFontSize(ctx, fontDef.pixelSize); - CGContextSetShouldAntialias(ctx, (aa || fontDef.pointSize > antialiasingThreshold) - && !(fontDef.styleStrategy & QFont::NoAntialias)); - CGContextSetShouldSmoothFonts(ctx, aa); + const bool antialias = (aa || fontDef.pointSize > antialiasingThreshold) && !(fontDef.styleStrategy & QFont::NoAntialias); + CGContextSetShouldAntialias(ctx, antialias); + const bool smoothing = antialias && !(fontDef.styleStrategy & QFont::NoSubpixelAntialias); + CGContextSetShouldSmoothFonts(ctx, smoothing); CGAffineTransform cgMatrix = CGAffineTransformIdentity; |