summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine_qws.cpp
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-08-27 16:32:49 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-08-27 16:32:49 (GMT)
commit3ca305cf25033477b73121aa6622f8c9115285ec (patch)
tree59edd09384ffca0b5e68a777a032a9aa3f65a9df /src/gui/text/qfontengine_qws.cpp
parent2cac8ca88c9b5b2f9d3040b1543d88ecee52da99 (diff)
parentd3b898e973662707f9644b4fe5f8d18849929723 (diff)
downloadQt-3ca305cf25033477b73121aa6622f8c9115285ec.zip
Qt-3ca305cf25033477b73121aa6622f8c9115285ec.tar.gz
Qt-3ca305cf25033477b73121aa6622f8c9115285ec.tar.bz2
Merge branch '4.7' into qmldocs
Diffstat (limited to 'src/gui/text/qfontengine_qws.cpp')
-rw-r--r--src/gui/text/qfontengine_qws.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_qws.cpp b/src/gui/text/qfontengine_qws.cpp
index a7a95d0..decc89c 100644
--- a/src/gui/text/qfontengine_qws.cpp
+++ b/src/gui/text/qfontengine_qws.cpp
@@ -557,7 +557,7 @@ glyph_metrics_t QFontEngineQPF1::boundingBox(const QGlyphLayout &glyphs)
QFixed w = 0;
for (int i = 0; i < glyphs.numGlyphs; ++i)
w += glyphs.effectiveAdvance(i);
- return glyph_metrics_t(0, -ascent(), w, ascent()+descent()+1, w, 0);
+ return glyph_metrics_t(0, -ascent(), w - lastRightBearing(glyphs), ascent()+descent()+1, w, 0);
}
glyph_metrics_t QFontEngineQPF1::boundingBox(glyph_t glyph)