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/opengl | |
| 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/opengl')
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index bbb75bc..fa38b5d 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -1623,8 +1623,8 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngineGlyphCache::Type glyp if (c.isNull()) continue; - int x = staticTextItem->glyphPositions[i].x.toInt() + c.baseLineX - margin; - int y = staticTextItem->glyphPositions[i].y.toInt() - c.baseLineY - margin; + int x = qFloor(staticTextItem->glyphPositions[i].x) + c.baseLineX - margin; + int y = qFloor(staticTextItem->glyphPositions[i].y) - c.baseLineY - margin; vertexCoordinates->addQuad(QRectF(x, y, c.w, c.h)); textureCoordinates->addQuad(QRectF(c.x*dx, c.y*dy, c.w * dx, c.h * dy)); |