diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-13 22:00:15 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-13 22:00:15 (GMT) |
| commit | f103ad276181090da8c70bd29f4474ea7657e03f (patch) | |
| tree | 699011ee56f49596079e786e93d8d507990f9614 /src/gui/painting | |
| parent | b6a25ff0118adc4aa6ab1523496fd1a5e384ebd4 (diff) | |
| parent | 28ef9731df2b3cd865af89cc474c5fa20c24e492 (diff) | |
| download | Qt-f103ad276181090da8c70bd29f4474ea7657e03f.zip Qt-f103ad276181090da8c70bd29f4474ea7657e03f.tar.gz Qt-f103ad276181090da8c70bd29f4474ea7657e03f.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 9749244..c92d291 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -3164,10 +3164,8 @@ void QRasterPaintEngine::drawGlyphsS60(const QPointF &p, const QTextItemInt &ti) const TUint8 *glyphBitmapBytes; TSize glyphBitmapSize; fe->getCharacterData(glyphs[i], tmetrics, glyphBitmapBytes, glyphBitmapSize); - const glyph_metrics_t metrics = ti.fontEngine->boundingBox(glyphs[i]); - const int x = qFloor(positions[i].x + metrics.x + aliasDelta); - const int y = qFloor(positions[i].y + metrics.y + aliasDelta); - + const int x = qFloor(positions[i].x + tmetrics.HorizBearingX() + aliasDelta); + const int y = qFloor(positions[i].y - tmetrics.HorizBearingY() + aliasDelta); alphaPenBlt(glyphBitmapBytes, glyphBitmapSize.iWidth, 8, x, y, glyphBitmapSize.iWidth, glyphBitmapSize.iHeight); } |