summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-10-19 06:30:48 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-10-19 11:58:40 (GMT)
commit226d67e9077b908a128521a6bb763cf412fbe87e (patch)
tree6a0913ec3696c148c75f54177a070dd2fc0c4d8d /src/gui/painting
parent162dd5b9360a362a78e77387ed92c49934201a32 (diff)
downloadQt-226d67e9077b908a128521a6bb763cf412fbe87e.zip
Qt-226d67e9077b908a128521a6bb763cf412fbe87e.tar.gz
Qt-226d67e9077b908a128521a6bb763cf412fbe87e.tar.bz2
Fixed bad glyph rendering under cocoa
The positioning is still wrong, but now it at least the glyphs are ok Reviewed-by: msorvig
Diffstat (limited to 'src/gui/painting')
-rw-r--r--src/gui/painting/qtextureglyphcache.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index 25b6aba..9e5707d 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -230,7 +230,14 @@ void QImageTextureGlyphCache::createTextureData(int width, int height)
int QImageTextureGlyphCache::glyphMargin() const
{
#ifdef Q_WS_MAC
+
+#ifdef QT_MAC_USE_COCOA
+ // For cocoa the margin is built into the glyph it seems..
+ return 0;
+#else
return 2;
+#endif
+
#else
return m_type == QFontEngineGlyphCache::Raster_RGBMask ? 2 : 0;
#endif