diff options
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 37 |
2 files changed, 39 insertions, 0 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 384b395f70..0546f80fd5 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -399,6 +399,8 @@ void QQuickTextPrivate::updateSize() layedOutTextRect = QRectF(0, 0, 0, fontHeight); advance = QSizeF(); signalSizeChange(previousSize); + lineCount = 1; + emit q->lineCountChanged(); updateType = UpdatePaintNode; q->update(); return; diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index 7a7e03c088..d1716c20da 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -2243,6 +2243,43 @@ void tst_qquicktext::lineCount() QCOMPARE(myText->lineCount(), 2); QCOMPARE(myText->truncated(), true); QCOMPARE(myText->maximumLineCount(), 2); + + // QTBUG-84458 + myText->resetMaximumLineCount(); + myText->setText("qqqqq\nqqqqq"); + QCOMPARE(myText->lineCount(), 2); + myText->setText("qqqqq\nqqqqq\nqqqqq"); + QCOMPARE(myText->lineCount(), 3); + myText->setText(""); + QCOMPARE(myText->lineCount(), 1); + + myText->setText("qqqqq\nqqqqq\nqqqqq"); + QCOMPARE(myText->lineCount(), 3); + myText->setFontSizeMode(QQuickText::HorizontalFit); + myText->setText(""); + QCOMPARE(myText->lineCount(), 1); + + myText->setText("qqqqq\nqqqqq\nqqqqq"); + QCOMPARE(myText->lineCount(), 3); + myText->setFontSizeMode(QQuickText::VerticalFit); + myText->setText(""); + QCOMPARE(myText->lineCount(), 1); + + myText->setText("qqqqq\nqqqqq\nqqqqq"); + QCOMPARE(myText->lineCount(), 3); + myText->setFontSizeMode(QQuickText::Fit); + myText->setText(""); + QCOMPARE(myText->lineCount(), 1); + + QScopedPointer<QQuickView> layoutWindow(createView(testFile("lineLayoutHAlign.qml"))); + QQuickText *lineLaidOut = layoutWindow->rootObject()->findChild<QQuickText*>("myText"); + QVERIFY(lineLaidOut != nullptr); + + lineLaidOut->setText("qqqqq\nqqqqq\nqqqqq"); + QCOMPARE(lineLaidOut->lineCount(), 3); + lineLaidOut->setFontSizeMode(QQuickText::FixedSize); + lineLaidOut->setText(""); + QCOMPARE(lineLaidOut->lineCount(), 1); } void tst_qquicktext::lineHeight() |