diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-15 09:05:43 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-15 09:11:31 (GMT) |
| commit | 3ef69b12f6d6905594ef3976b3e16787378dfe6a (patch) | |
| tree | 1105fb45cddf0afca5929041e679e743e36a1772 /src/gui/painting/qpaintengine_raster.cpp | |
| parent | 1745a0e7799774373ad6252a73d6e8af841db2a1 (diff) | |
| parent | 9358d77fc1de64d2a8a06bfa4095dcde9f9b009b (diff) | |
| download | Qt-3ef69b12f6d6905594ef3976b3e16787378dfe6a.zip Qt-3ef69b12f6d6905594ef3976b3e16787378dfe6a.tar.gz Qt-3ef69b12f6d6905594ef3976b3e16787378dfe6a.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/painting/qpaintengine_raster.cpp
tests/auto/declarative/qdeclarativetext/data/alignments_cb.png
tests/auto/declarative/qdeclarativetext/data/alignments_cc.png
tests/auto/declarative/qdeclarativetext/data/alignments_ct.png
Diffstat (limited to 'src/gui/painting/qpaintengine_raster.cpp')
| -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 23be51b..38d7d2f 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -3153,10 +3153,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); - const int y = qFloor(positions[i].y + metrics.y); - + const int x = qFloor(positions[i].x + tmetrics.HorizBearingX()); + const int y = qFloor(positions[i].y - tmetrics.HorizBearingY()); alphaPenBlt(glyphBitmapBytes, glyphBitmapSize.iWidth, 8, x, y, glyphBitmapSize.iWidth, glyphBitmapSize.iHeight); } |