Fixes: NB#192037, Multiline MTextedit doesn't expand to next line on word wrapping

RevBy: Pekka Vuorela
Details: Document text width and widget width were mixed up when
calculating sizeHint.

2 files changed, 54 insertions, 0 deletions

diff --git a/tests/ut_mtexteditview/ut_mtexteditview.cpp b/tests/ut_mtexteditview/ut_mtexteditview.cpp
index 58966461..c92d5d09 100644
--- a/tests/ut_mtexteditview/ut_mtexteditview.cpp
+++ b/tests/ut_mtexteditview/ut_mtexteditview.cpp
@@ -19,6 +19,7 @@
 
 #include "ut_mtexteditview.h"
 
+#include <QGraphicsLinearLayout>
 #include <QGraphicsSceneMouseEvent>
 #include <QMetaType>
 #include <QSignalSpy>
@@ -150,6 +151,58 @@ void Ut_MTextEditView::testGrowing()
     QCOMPARE(newSize.height(), oldSize.height());
 }
 
+void Ut_MTextEditView::testMultilineGrowsOnWordWrap()
+{
+    // Initialize multiline text edit with one row and that row full of text.
+    // Then insert one character so that text edit wraps into two lines.
+    // This test verifies a fix for a bug where the text edit did not grow even though
+    // QTextDocument was updated correctly.
+
+    QString fullRowContent = "full row content";
+    m_controller->setText(fullRowContent);
+
+    const qreal horizontalPadding = m_subject->style()->paddingLeft() + m_subject->style()->paddingRight();
+    QFontMetrics fm(m_controller->document()->defaultFont());
+    qreal totalWidth = fm.width(fullRowContent)
+                       + horizontalPadding
+                       + m_controller->document()->documentMargin() * 2;
+
+    m_controller->setPreferredWidth(totalWidth);
+
+    QSizePolicy policy(m_controller->sizePolicy());
+    policy.setVerticalPolicy(QSizePolicy::Preferred);
+    m_controller->setSizePolicy(policy);
+
+    // Create container widget with vertical layout.
+    QGraphicsWidget container;
+    container.resize(totalWidth, 200); // vertically: enough
+
+    QGraphicsLinearLayout *vlayout = new QGraphicsLinearLayout(Qt::Vertical, &container);
+    vlayout->setContentsMargins(0,0,0,0);
+    vlayout->addItem(m_controller);
+    vlayout->addStretch();
+
+    // Activate layout before retrieving size.
+    vlayout->activate();
+    const QSizeF beforeInserting = m_controller->size();
+
+    // This causes word wrap to take place.
+    m_controller->textCursor().insertText("w");
+
+    // Activate layout before retrieving size.
+    vlayout->activate();
+    const QSizeF afterInserting = m_controller->size();
+
+    // Detach from parent
+    vlayout->removeItem(m_controller);
+    m_controller->setParentItem(0);
+    m_controller->setLayout(0);
+
+    qDebug() << "Size " << beforeInserting << " after inserting one extra character: " << afterInserting;
+    QVERIFY(afterInserting != beforeInserting);
+}
+
+
 void Ut_MTextEditView::testInputMethodQuery()
 {
     m_appWindow->scene()->addItem(m_controller);
diff --git a/tests/ut_mtexteditview/ut_mtexteditview.h b/tests/ut_mtexteditview/ut_mtexteditview.h
index 64f72b56..ee5c0837 100644
--- a/tests/ut_mtexteditview/ut_mtexteditview.h
+++ b/tests/ut_mtexteditview/ut_mtexteditview.h
@@ -47,6 +47,7 @@ private slots:
     void testStyleUpdated();
     void testResizeEvent();
     void testGrowing();
+    void testMultilineGrowsOnWordWrap();
     void testInputMethodQuery();
     void testMaskedCharacters();
     void testUpdateScrollWhenTextChanged();