summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-09-22 09:05:11 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-23 11:31:12 +0200
commit294df24621ddd4e08ca792cd8e541dcc84409acb (patch)
tree8bfda5a5f20791addb6fff6b530a334dce2301e6 /tests/auto
parent5fb67c1dacce58c034980c5c559f74ce9ec2c756 (diff)
Patch toward fixing tst_QWidget::windowState().
In QWidget::setWindowState() there was some code to emulate window states when they're not supported by the backend, by hiding the window on minimize or using the screen geometry and the frameless window hint to manually try to make a window fullscreen. However, some of this code was being run even when the backend does support setting window states, specifically calling setParent(0) to force a re-creation of the platform window and calling show(). These led to the window getting the wrong position after being minimized or fullscreen and going back to the normal state. Apart from storing the normal geometry of a widget when going away from the normal state we shouldn't do any magic when the call to QPlatformWindow::setWindowState() succeeds. tst_QWidget::windowState() still fails due to calling move() to set the position of the widget including the frame, when QWindow currently only supports setting the position of the widget excluding the frame. Change-Id: I1c1a337d3c15f14c1c842bd1e347f94e6b67d7eb Reviewed-on: http://codereview.qt-project.org/5367 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qwidget/tst_qwidget.cpp34
1 files changed, 30 insertions, 4 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 99b069487f..1414123296 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -1829,67 +1829,93 @@ void tst_QWidget::windowState()
widget1.setWindowState(Qt::WindowMaximized);
QTest::qWait(100);
VERIFY_STATE(Qt::WindowMaximized);
+ QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowMaximized);
widget1.show();
QTest::qWait(100);
VERIFY_STATE(Qt::WindowMaximized);
+ QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowMaximized);
widget1.setWindowState(widget1.windowState() ^ Qt::WindowMaximized);
QTest::qWait(100);
QVERIFY(!(widget1.windowState() & Qt::WindowMaximized));
- QCOMPARE(widget1.pos(), pos);
+ QTRY_COMPARE(widget1.pos(), pos);
+ QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowNoState);
widget1.setWindowState(Qt::WindowMinimized);
QTest::qWait(100);
VERIFY_STATE(Qt::WindowMinimized);
+ QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowMinimized);
widget1.setWindowState(widget1.windowState() | Qt::WindowMaximized);
QTest::qWait(100);
VERIFY_STATE((Qt::WindowMinimized|Qt::WindowMaximized));
+ QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowMinimized);
widget1.setWindowState(widget1.windowState() ^ Qt::WindowMinimized);
QTest::qWait(100);
VERIFY_STATE(Qt::WindowMaximized);
+ QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowMaximized);
widget1.setWindowState(widget1.windowState() ^ Qt::WindowMaximized);
QTest::qWait(100);
QVERIFY(!(widget1.windowState() & (Qt::WindowMinimized|Qt::WindowMaximized)));
- QCOMPARE(widget1.pos(), pos);
+ QTRY_COMPARE(widget1.pos(), pos);
+ QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowNoState);
widget1.setWindowState(Qt::WindowFullScreen);
QTest::qWait(100);
VERIFY_STATE(Qt::WindowFullScreen);
+ QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowFullScreen);
widget1.setWindowState(widget1.windowState() ^ Qt::WindowMinimized);
QTest::qWait(100);
VERIFY_STATE((Qt::WindowFullScreen|Qt::WindowMinimized));
+ QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowMinimized);
widget1.setWindowState(widget1.windowState() ^ Qt::WindowMinimized);
QTest::qWait(100);
VERIFY_STATE(Qt::WindowFullScreen);
+ QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowFullScreen);
+
+ widget1.setWindowState(Qt::WindowNoState);
+ QTest::qWait(100);
+ VERIFY_STATE(Qt::WindowNoState);
+ QTRY_COMPARE(widget1.pos(), pos);
+ QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowNoState);
+
+ widget1.setWindowState(Qt::WindowFullScreen);
+ QTest::qWait(100);
+ VERIFY_STATE(Qt::WindowFullScreen);
+ QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowFullScreen);
widget1.setWindowState(widget1.windowState() ^ Qt::WindowMaximized);
QTest::qWait(100);
VERIFY_STATE((Qt::WindowFullScreen|Qt::WindowMaximized));
+ QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowFullScreen);
widget1.setWindowState(widget1.windowState() ^ Qt::WindowMinimized);
QTest::qWait(100);
VERIFY_STATE((Qt::WindowFullScreen|Qt::WindowMaximized|Qt::WindowMinimized));
+ QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowMinimized);
widget1.setWindowState(widget1.windowState() ^ Qt::WindowMinimized);
QTest::qWait(100);
VERIFY_STATE((Qt::WindowFullScreen|Qt::WindowMaximized));
+ QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowFullScreen);
widget1.setWindowState(widget1.windowState() ^ Qt::WindowFullScreen);
QTest::qWait(100);
VERIFY_STATE(Qt::WindowMaximized);
+ QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowMaximized);
widget1.setWindowState(widget1.windowState() ^ Qt::WindowMaximized);
QTest::qWait(100);
QVERIFY(!(widget1.windowState() & stateMask));
+ QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowNoState);
- QCOMPARE(widget1.pos(), pos);
- QCOMPARE(widget1.size(), size);
+ QTRY_COMPARE(widget1.pos(), pos);
+ QTRY_COMPARE(widget1.size(), size);
#endif
}