diff options
author | Andrew Knight <andrew.knight@digia.com> | 2013-08-13 16:53:49 +0300 |
---|---|---|
committer | Andy Nichols <andy.nichols@digia.com> | 2013-08-13 15:58:35 +0200 |
commit | 575b3f143c2694d2c6c4648d14638958279c08a0 (patch) | |
tree | d3f0635f804404b9edcdd713f0ac2c94cc9eeb17 | |
parent | e48ea148aa285e81ab78c23ded3a5f6224883a05 (diff) |
Correct placement of window event flush for window state
A bad cherry-pick meant that 155363 put some code window flushing code
inside the wrong function. This fixes where the flush should occur.
Change-Id: I468d9881d08c358cf559a12d52b18702db3cb1e0
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
-rw-r--r-- | src/plugins/platforms/wayland_common/qwaylandwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/wayland_common/qwaylandwindow.cpp b/src/plugins/platforms/wayland_common/qwaylandwindow.cpp index 77ca32cc3..7085e11af 100644 --- a/src/plugins/platforms/wayland_common/qwaylandwindow.cpp +++ b/src/plugins/platforms/wayland_common/qwaylandwindow.cpp @@ -227,9 +227,6 @@ void QWaylandWindow::configure(uint32_t edges, int32_t width, int32_t height) mRequestResizeSent= true; QMetaObject::invokeMethod(this, "requestResize", Qt::QueuedConnection); } - - QWindowSystemInterface::handleWindowStateChanged(window(), mState); - QWindowSystemInterface::flushWindowSystemEvents(); // Required for oldState to work on WindowStateChanged } void QWaylandWindow::doResize() @@ -403,6 +400,9 @@ void QWaylandWindow::setWindowState(Qt::WindowState state) default: mShellSurface->setNormal(); } + + QWindowSystemInterface::handleWindowStateChanged(window(), mState); + QWindowSystemInterface::flushWindowSystemEvents(); // Required for oldState to work on WindowStateChanged } void QWaylandWindow::setWindowFlags(Qt::WindowFlags flags) |