diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-02-06 15:20:10 +0100 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-02-15 14:37:03 +0000 |
commit | 54e4735f89489da9f1cf71b85561a4939e8a42e3 (patch) | |
tree | 3e7988d3d2b7c4130f4355b17a7f44eeddd0d24d /src/gui/kernel/qwindowsysteminterface_p.h | |
parent | 1037eebc0b481678a40f034284d489e278be557a (diff) |
qpa: Let platform plugins report old state for window state changes
The previous logic relied on QPlatformWindow::setWindowState() being
synchronous and delivering the QPA event before returning to QWindow,
in which case window->windowState() would still refer to the old
state. Async platforms can now report the previous state correctly.
Change-Id: Ib9148fe23fb62be55b7e3a0ccf63d32c71dc2ad3
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/gui/kernel/qwindowsysteminterface_p.h')
-rw-r--r-- | src/gui/kernel/qwindowsysteminterface_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qwindowsysteminterface_p.h b/src/gui/kernel/qwindowsysteminterface_p.h index 1db60e8cb8..1bcc79552d 100644 --- a/src/gui/kernel/qwindowsysteminterface_p.h +++ b/src/gui/kernel/qwindowsysteminterface_p.h @@ -168,12 +168,13 @@ public: class WindowStateChangedEvent : public WindowSystemEvent { public: - WindowStateChangedEvent(QWindow *_window, Qt::WindowState _newState) - : WindowSystemEvent(WindowStateChanged), window(_window), newState(_newState) + WindowStateChangedEvent(QWindow *_window, Qt::WindowState _newState, Qt::WindowState _oldState) + : WindowSystemEvent(WindowStateChanged), window(_window), newState(_newState), oldState(_oldState) { } QPointer<QWindow> window; Qt::WindowState newState; + Qt::WindowState oldState; }; class WindowScreenChangedEvent : public WindowSystemEvent { |