summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qtextureglyphcache.cpp
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2009-10-21 11:31:07 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2009-10-21 11:31:07 (GMT)
commit3be273fc751624fab078878904ad3cb483cd141f (patch)
tree506e72bee69821db1c9ec7fc2bdf4ece23abf3e5 /src/gui/painting/qtextureglyphcache.cpp
parent84cfe9af5e333872ac67368a6b14c377ceeda8ec (diff)
downloadQt-3be273fc751624fab078878904ad3cb483cd141f.zip
Qt-3be273fc751624fab078878904ad3cb483cd141f.tar.gz
Qt-3be273fc751624fab078878904ad3cb483cd141f.tar.bz2
Properly detect font smoothing setting on Mac OS X in raster engine
We would assume font smoothing on the mac was always turned on, giving poor text rendering in the cases where it was not. This implementation mirrors querying the cleartype setting on Windows, checking the setting on application initialization and rendering into an 8 bit cache if it is turned off. Task-number: QTBUG-4881 Reviewed-by: Morten Johan Sørvig
Diffstat (limited to 'src/gui/painting/qtextureglyphcache.cpp')
-rw-r--r--src/gui/painting/qtextureglyphcache.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index 25b6aba..a192e87 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -229,8 +229,8 @@ void QImageTextureGlyphCache::createTextureData(int width, int height)
int QImageTextureGlyphCache::glyphMargin() const
{
-#ifdef Q_WS_MAC
- return 2;
+#if defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)
+ return 0;
#else
return m_type == QFontEngineGlyphCache::Raster_RGBMask ? 2 : 0;
#endif