diff options
author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-05-24 09:50:16 (GMT) |
---|---|---|
committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-05-30 10:35:29 (GMT) |
commit | 93bce7874721de905af0181da95c58fe13a2e015 (patch) | |
tree | 9244310abc3dd26c0555e5127a1f164accbbfbe2 /src/gui/painting/qpainter.cpp | |
parent | 35421a9313a324ff63df6ba27e03b8090c964717 (diff) | |
download | Qt-93bce7874721de905af0181da95c58fe13a2e015.zip Qt-93bce7874721de905af0181da95c58fe13a2e015.tar.gz Qt-93bce7874721de905af0181da95c58fe13a2e015.tar.bz2 |
Keep line consistency with text baseline
Also revert previous underline patch.
Reviewed-by: Eskil
Diffstat (limited to 'src/gui/painting/qpainter.cpp')
-rw-r--r-- | src/gui/painting/qpainter.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 7130fbf..3cdf8fe 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -6468,8 +6468,7 @@ 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 aliasedCoordinateDelta = 0.5 - 0.015625; - const qreal underlinePos = pos.y() + qCeil(underlineOffset) - aliasedCoordinateDelta; + const qreal underlinePos = pos.y() + qCeil(underlineOffset); if (underlineStyle == QTextCharFormat::SpellCheckUnderline) { underlineStyle = QTextCharFormat::UnderlineStyle(QApplication::style()->styleHint(QStyle::SH_SpellCheckUnderlineStyle)); |