diff options
Diffstat (limited to 'src/gui/text/qstatictext.cpp')
-rw-r--r-- | src/gui/text/qstatictext.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 2f90754274..0026e3edfb 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -39,6 +39,7 @@ #include "qstatictext.h" #include "qstatictext_p.h" +#include <qmath.h> #include <private/qtextengine_p.h> #include <private/qfontengine_p.h> #include <qabstracttextdocumentlayout.h> @@ -611,22 +612,22 @@ void QStaticTextPrivate::paintText(const QPointF &topLeftPosition, QPainter *p, textLayout.setTextOption(textOption); textLayout.setCacheEnabled(true); - qreal leading = QFontMetricsF(font).leading(); - qreal height = -leading; - + qreal height = 0; textLayout.beginLayout(); while (1) { QTextLine line = textLayout.createLine(); if (!line.isValid()) break; + line.setLeadingIncluded(true); if (textWidth >= 0.0) line.setLineWidth(textWidth); else line.setLineWidth(QFIXED_MAX); - height += leading; line.setPosition(QPointF(0.0, height)); height += line.height(); + if (line.leading() < 0) + height += qCeil(line.leading()); } textLayout.endLayout(); |