diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-03-19 13:51:53 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-20 11:44:09 +0100 |
| commit | 9f4d567f4357392f1a7cfdb7408dec2fc2793b41 (patch) | |
| tree | ec97e6dafd3af414208389ccfb547257588b2a9f /src/plugins/platforms | |
| parent | c4ac14fae1765cae9d5ab94c8af486e2d14dede7 (diff) | |
Cocoa: set font engine glyph format based on display type
Make the QCoreTextFontEngine::glyphFormat depend on the primary
display's subpixel layout (if any). This change also refactors the
antialiasing threshold setting to live beside the defaultGlyphFormat.
Change-Id: I27f94f775d91d2a68cd647cc24503b31b6ff5e61
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/cocoa/cocoa.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qpaintengine_mac.mm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index e861f48e7b..2ae39dd16c 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -73,7 +73,7 @@ HEADERS += qcocoaintegration.h \ FORMS += $$PWD/../../../widgets/dialogs/qfiledialog.ui RESOURCES += qcocoaresources.qrc -LIBS += -framework Cocoa +LIBS += -framework Cocoa -framework IOKit QT += core-private gui-private widgets-private platformsupport-private printsupport diff --git a/src/plugins/platforms/cocoa/qpaintengine_mac.mm b/src/plugins/platforms/cocoa/qpaintengine_mac.mm index 8b8445c995..87f3713920 100644 --- a/src/plugins/platforms/cocoa/qpaintengine_mac.mm +++ b/src/plugins/platforms/cocoa/qpaintengine_mac.mm @@ -73,8 +73,6 @@ QT_BEGIN_NAMESPACE -extern int qt_antialiasing_threshold; // from qcoretextfontdatabase.mm - /***************************************************************************** QCoreGraphicsPaintEngine utility functions *****************************************************************************/ @@ -1182,7 +1180,9 @@ void QCoreGraphicsPaintEngine::drawTextItem(const QPointF &pos, const QTextItem QFontEngine *fe = ti.fontEngine; - const bool textAA = state->renderHints() & QPainter::TextAntialiasing && fe->fontDef.pointSize > qt_antialiasing_threshold && !(fe->fontDef.styleStrategy & QFont::NoAntialias); + const bool textAA = ((state->renderHints() & QPainter::TextAntialiasing) + && (fe->fontDef.pointSize > QCoreTextFontEngine::antialiasingThreshold) + && !(fe->fontDef.styleStrategy & QFont::NoAntialias)); const bool lineAA = state->renderHints() & QPainter::Antialiasing; if (textAA != lineAA) CGContextSetShouldAntialias(d->hd, textAA); |