diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-15 04:44:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-15 04:44:41 (GMT) |
| commit | 9b3bda409d152b14e99cd3f83ca0bfc9b837ccf2 (patch) | |
| tree | c4f103b6c83d1008b00e21e330df2c6b780a8c33 /src/gui/text | |
| parent | b36e357b982ba01cbf905fb1d0340e87030b0a95 (diff) | |
| parent | 0d6451ec1f1042dbf8c8cd7f2759e2a385d29696 (diff) | |
| download | Qt-9b3bda409d152b14e99cd3f83ca0bfc9b837ccf2.zip Qt-9b3bda409d152b14e99cd3f83ca0bfc9b837ccf2.tar.gz Qt-9b3bda409d152b14e99cd3f83ca0bfc9b837ccf2.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Introduced new class QAnimationDriver for plugging in what drives animations
Use correct font for menu item shortcuts
Fix text rendering offset for raster engine on Mac
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontengine_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_mac.mm b/src/gui/text/qfontengine_mac.mm index 7efb1cc..51e18ec 100644 --- a/src/gui/text/qfontengine_mac.mm +++ b/src/gui/text/qfontengine_mac.mm @@ -694,7 +694,7 @@ QImage QCoreTextFontEngine::imageForGlyph(glyph_t glyph, QFixed subPixelPosition CGContextSetFont(ctx, cgFont); qreal pos_x = -br.x.toReal() + subPixelPosition.toReal(); - qreal pos_y = im.height()+br.y.toReal(); + qreal pos_y = im.height() + br.y.toReal() - 1; CGContextSetTextPosition(ctx, pos_x, pos_y); CGSize advance; |