summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2011-03-29 07:24:57 (GMT)
committeraavit <qt-info@nokia.com>2011-03-29 07:24:57 (GMT)
commit2ea1c931713ddca8bbc718e7691867ad117d5a6e (patch)
tree47bcc9e6dc1b2ea895e79b61ba96f66b595c87b9 /src/gui/painting
parent53f16164661f8692aef9bd941b92697a047c0f4c (diff)
parenteeca1aee72a69584aa20bdb9f5c4e48d7e3cbc16 (diff)
downloadQt-2ea1c931713ddca8bbc718e7691867ad117d5a6e.zip
Qt-2ea1c931713ddca8bbc718e7691867ad117d5a6e.tar.gz
Qt-2ea1c931713ddca8bbc718e7691867ad117d5a6e.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team
Diffstat (limited to 'src/gui/painting')
-rw-r--r--src/gui/painting/qpainter.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 14fb772..638f4ca 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -6468,7 +6468,8 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const
const qreal underlineOffset = fe->underlinePosition().toReal();
// deliberately ceil the offset to avoid the underline coming too close to
// the text above it.
- const qreal underlinePos = pos.y() + qCeil(underlineOffset);
+ const qreal aliasedCoordinateDelta = 0.5 - 0.015625;
+ const qreal underlinePos = pos.y() + qCeil(underlineOffset) - aliasedCoordinateDelta;
if (underlineStyle == QTextCharFormat::SpellCheckUnderline) {
underlineStyle = QTextCharFormat::UnderlineStyle(QApplication::style()->styleHint(QStyle::SH_SpellCheckUnderlineStyle));