From 788e1b2ffa5541b86f62bf468540bb8b5872c033 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Mon, 29 Oct 2012 15:16:55 +0100 Subject: Pixel-align vertical metrics in QTextLayout again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To avoid regressing due to de58eb64bc564fcb8af61a45576783e432d2380c, we need to return a pixel aligned height in QTextLine::height() and also use pixel aligned heights when calculating the position of lines as well as the bounding rect of the layout. Later, we can add a QTextLine::naturalHeight() or something like that which gives the fractional value, but until then, we need to access private API in QPainter to get the correct alignment, since we still don't want to align the height of the last line in the layout, we only want to align the origin of each line. Task-number: QTBUG-27740 Change-Id: I12325f07d33aaf1a1b967e0a11492759d0f565d9 Reviewed-by: Caroline Chao Reviewed-by: Samuel Rødal --- src/gui/painting/qpainter.cpp | 5 ++++- src/gui/text/qtextlayout.cpp | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 7070e5732d..0cfe953e43 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -7498,8 +7498,11 @@ start_lengthVariant: l.setLineWidth(lineWidth); height += leading; + + // Make sure lines are positioned on whole pixels + height = qCeil(height); l.setPosition(QPointF(0., height)); - height += l.height(); + height += textLayout.engine()->lines[l.lineNumber()].height().toReal(); width = qMax(width, l.naturalTextWidth()); if (!dontclip && !brect && height >= r.height()) break; diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index a0a92897c5..0ca8e8d9a6 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -916,7 +916,7 @@ QRectF QTextLayout::boundingRect() const QFixed lineWidth = si.width < QFIXED_MAX ? qMax(si.width, si.textWidth) : si.textWidth; xmax = qMax(xmax, si.x+lineWidth); // ### shouldn't the ascent be used in ymin??? - ymax = qMax(ymax, si.y+si.height()); + ymax = qMax(ymax, si.y+si.height().ceil()); } return QRectF(xmin.toReal(), ymin.toReal(), (xmax-xmin).toReal(), (ymax-ymin).toReal()); } @@ -1466,7 +1466,7 @@ qreal QTextLine::descent() const */ qreal QTextLine::height() const { - return eng->lines[index].height().toReal(); + return eng->lines[index].height().ceil().toReal(); } /*! -- cgit v1.2.3