From 294df24621ddd4e08ca792cd8e541dcc84409acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Thu, 22 Sep 2011 09:05:11 +0200 Subject: 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 Reviewed-by: Lars Knoll --- src/widgets/kernel/qwidget_qpa.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/widgets/kernel/qwidget_qpa.cpp') diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp index 39f8aa944d..4c65d08b6a 100644 --- a/src/widgets/kernel/qwidget_qpa.cpp +++ b/src/widgets/kernel/qwidget_qpa.cpp @@ -526,21 +526,23 @@ void QWidget::setWindowState(Qt::WindowStates newstate) Qt::WindowState oldEffectiveState = effectiveState(oldstate); if (isWindow() && newEffectiveState != oldEffectiveState) { d->createTLExtra(); - if (oldEffectiveState == Qt::WindowNoState) { //normal + if (oldEffectiveState == Qt::WindowNoState) d->topData()->normalGeometry = geometry(); - } else if (oldEffectiveState == Qt::WindowFullScreen) { - setParent(0, d->topData()->savedFlags); - needShow = true; - } else if (oldEffectiveState == Qt::WindowMinimized) { - needShow = true; - } Q_ASSERT(windowHandle()); windowHandle()->setWindowState(newEffectiveState); bool supported = windowHandle()->windowState() == newEffectiveState; if (!supported) { - // emulate the window state + // undo the effects of the old emulated state + if (oldEffectiveState == Qt::WindowFullScreen) { + setParent(0, d->topData()->savedFlags); + needShow = true; + } else if (oldEffectiveState == Qt::WindowMinimized) { + needShow = true; + } + + // emulate the new window state if (newEffectiveState == Qt::WindowMinimized) { //### not ideal... hide(); -- cgit v1.2.3