diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-14 09:49:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-14 09:49:01 (GMT) |
| commit | 5de30ecf4c28279fe8eed0ed8cb53504eb1350d7 (patch) | |
| tree | 49af06e86b70d06ea090077f68931877c36e0ff9 /src/gui | |
| parent | 5b6933ae8e2bb8b3ca33ef7f31ba564b4cb53bec (diff) | |
| parent | f2e723839b4067581fc2974a29aebdd41cb881f6 (diff) | |
| download | Qt-5de30ecf4c28279fe8eed0ed8cb53504eb1350d7.zip Qt-5de30ecf4c28279fe8eed0ed8cb53504eb1350d7.tar.gz Qt-5de30ecf4c28279fe8eed0ed8cb53504eb1350d7.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fix static text item positioning GL2 paint engine
Fix combining marks handling in Core Text shaper
Fix PBuffer example to work again
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qfontengine_coretext.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_coretext.mm b/src/gui/text/qfontengine_coretext.mm index a24a79e..526b566 100644 --- a/src/gui/text/qfontengine_coretext.mm +++ b/src/gui/text/qfontengine_coretext.mm @@ -234,7 +234,8 @@ bool QCoreTextFontEngineMulti::stringToCMap(const QChar *str, int len, QGlyphLay int idx = rtlOffset + rtlSign * i; outGlyphs[idx] = tmpGlyphs[i] | fontIndex; outAdvances_x[idx] = QFixed::fromReal(tmpPoints[i + 1].x - tmpPoints[i].x); - outAdvances_y[idx] = QFixed::fromReal(tmpPoints[i + 1].y - tmpPoints[i].y); + // Use negative y advance for flipped coordinate system + outAdvances_y[idx] = QFixed::fromReal(tmpPoints[i].y - tmpPoints[i + 1].y); if (fontDef.styleStrategy & QFont::ForceIntegerMetrics) { outAdvances_x[idx] = outAdvances_x[idx].round(); |