diff options
| -rw-r--r-- | src/gui/text/qstatictext.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/gui/text/qstatictext/tst_qstatictext.cpp | 39 |
2 files changed, 39 insertions, 3 deletions
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 68f33a8ed7..2f90754274 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -662,9 +662,6 @@ void QStaticTextPrivate::paintText(const QPointF &topLeftPosition, QPainter *p, document.documentLayout()->draw(p, ctx); p->restore(); - if (textWidth >= 0.0) - document.adjustSize(); // Find optimal size - actualSize = document.size(); } } diff --git a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp index e3cb265ebe..45cc94afad 100644 --- a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp +++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp @@ -98,6 +98,8 @@ private slots: void multiLine(); + void size_qtbug65836(); + private: bool supportsTransformations() const; @@ -912,5 +914,42 @@ void tst_QStaticText::multiLine() QCOMPARE(paintEngine->differentVerticalPositions.size(), 2); } +void tst_QStaticText::size_qtbug65836() +{ + const QString text = QLatin1String("Lorem ipsum dolor sit amet, " + "consectetur adipiscing elit."); + QFont font("Courier"); + font.setPixelSize(15); + + { + QStaticText st1(text); + st1.setTextFormat(Qt::PlainText); + st1.prepare(QTransform(), font); + + QStaticText st2(text); + st2.setTextFormat(Qt::RichText); + QTextOption opt; + opt.setWrapMode(QTextOption::NoWrap); + st2.setTextOption(opt); + st2.prepare(QTransform(), font); + + QCOMPARE(st1.size(), st2.size()); + } + + { + QStaticText st1(text); + st1.setTextFormat(Qt::PlainText); + st1.setTextWidth(10.0); + st1.prepare(QTransform(), font); + + QStaticText st2(text); + st2.setTextFormat(Qt::RichText); + st2.setTextWidth(10.0); + st2.prepare(QTransform(), font); + + QCOMPARE(st1.size(), st2.size()); + } +} + QTEST_MAIN(tst_QStaticText) #include "tst_qstatictext.moc" |