From 82860b133c123d8136cf13e99f66c4b55badc5fa Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 20 Aug 2012 16:38:05 +0200 Subject: Propagate initial size constraints to QWidgetWindow. Size constraints set on a widget before the creation of the QWidgetWindow were lost (for example, Qt Creator's preference page). Task-number: QTBUG-26745 Change-Id: I7c2f5aed9c8817795603e5ad3c24418d66627bab Reviewed-by: Marc Mutz Reviewed-by: hjk --- .../kernel/qwidget_window/tst_qwidget_window.cpp | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp index 4daeb6ceb6..bccd9a5951 100644 --- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp +++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp @@ -46,6 +46,8 @@ #include #include +#include +#include class tst_QWidget_window : public QWidget @@ -60,6 +62,8 @@ public slots: void cleanupTestCase(); private slots: + void tst_min_max_size(); + void tst_min_max_size_data(); void tst_move_show(); void tst_show_move(); void tst_show_move_hide_show(); @@ -85,6 +89,39 @@ void tst_QWidget_window::cleanupTestCase() { } +/* Test if the maximum/minimum size constraints + * are propagated from the widget to the QWidgetWindow + * independently of whether they were set before or after + * window creation (QTBUG-26745). */ + +void tst_QWidget_window::tst_min_max_size_data() +{ + QTest::addColumn("setMinMaxSizeBeforeShow"); + QTest::newRow("Set min/max size after show") << false; + QTest::newRow("Set min/max size before show") << true; +} + +void tst_QWidget_window::tst_min_max_size() +{ + QFETCH(bool, setMinMaxSizeBeforeShow); + const QSize minSize(300, 400); + const QSize maxSize(1000, 500); + QWidget w1; + (new QVBoxLayout(&w1))->addWidget(new QPushButton("Test")); + if (setMinMaxSizeBeforeShow) { + w1.setMinimumSize(minSize); + w1.setMaximumSize(maxSize); + } + w1.show(); + if (!setMinMaxSizeBeforeShow) { + w1.setMinimumSize(minSize); + w1.setMaximumSize(maxSize); + } + QVERIFY(QTest::qWaitForWindowExposed(&w1)); + QCOMPARE(w1.windowHandle()->minimumSize(),minSize); + QCOMPARE(w1.windowHandle()->maximumSize(), maxSize); +} + void tst_QWidget_window::tst_move_show() { QWidget w; -- cgit v1.2.3