diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-03-30 13:20:06 (GMT) |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-03-30 13:20:06 (GMT) |
commit | ecb77c6376202c12ccb0f3683a6c96a60c2c951e (patch) | |
tree | da83d123427cf36f08b133b33e660b7c42b1c7da /src/gui/painting | |
parent | 0686a6d656641f2ac1fc1cd9710dcf538f8ff5c8 (diff) | |
download | Qt-ecb77c6376202c12ccb0f3683a6c96a60c2c951e.zip Qt-ecb77c6376202c12ccb0f3683a6c96a60c2c951e.tar.gz Qt-ecb77c6376202c12ccb0f3683a6c96a60c2c951e.tar.bz2 |
Revert "Fixed underline offset after raster coordinate system change."
Temporarily revert commit eeca1aee72a69584aa20bdb9f5c4e48d7e3cbc16,
which seemed to cause auto-test failures on Windows 7.
Diffstat (limited to 'src/gui/painting')
-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 638f4ca..14fb772 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)); |