Fix QFormLayout which allowed fields to be smaller that their minimum size

If the label's sizeHint is bigger than its minimumSizeHint, the field
may be resized smaller than its minimum size.

This also fix another problem where the field would 'jump' from one
sizehint to the others.

(This can happen if labels can word-wrap for example)

Reviewed-by: Michael Goddard

1 files changed, 30 insertions, 0 deletions

diff --git a/tests/auto/qformlayout/tst_qformlayout.cpp b/tests/auto/qformlayout/tst_qformlayout.cpp
index c4c6f70..242974d 100644
--- a/tests/auto/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/qformlayout/tst_qformlayout.cpp
@@ -125,6 +125,7 @@ private slots:
     Qt::Orientations expandingDirections() const;
 */
 
+    void fieldMinimumSize();
 };
 
 tst_QFormLayout::tst_QFormLayout()
@@ -905,6 +906,35 @@ void tst_QFormLayout::layoutAlone()
     QTest::qWait(500);
 }
 
+
+void tst_QFormLayout::fieldMinimumSize()
+{
+    //check that the field with is bigger than its minimumSizeHint for any size of the widget
+    // even if the label with is not fixed
+    QWidget w;
+    QFormLayout layout;
+    layout.setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
+    w.setLayout(&layout);
+    QLabel label1("Here is a strange test case");
+    label1.setWordWrap(true);
+    QLabel label2("Here is another label");
+    label2.setWordWrap(true);
+    QLabel shortLabel("short");
+    QLabel longLabel("Quite long label");
+    layout.addRow(&label1, &shortLabel);
+    layout.addRow(&label2, &longLabel);
+    w.show();
+    int width = w.size().width() + 9;
+
+    do {
+        w.resize(width, w.size().height());
+        layout.activate();
+        QVERIFY(shortLabel.size().width() >= shortLabel.minimumSizeHint().width());
+        QVERIFY(longLabel.size().width() >= longLabel.minimumSizeHint().width());
+        width -= 3;
+    } while(width >= w.minimumSizeHint().width());
+}
+
 QTEST_MAIN(tst_QFormLayout)
 
 #include "tst_qformlayout.moc"