diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2015-02-03 13:05:20 +0100 |
|---|---|---|
| committer | Daniel Molkentin <daniel@molkentin.de> | 2015-02-07 16:19:59 +0000 |
| commit | f4b8697c40bd476ef6bf83418e144adce7c7d4a3 (patch) | |
| tree | d5f7c03b627a459c5a6461ded2abc6d102c115ee /src/gui/kernel/qwindow_p.h | |
| parent | 45b60c01efc735ce9910d7724ee300855194ff33 (diff) | |
Handle gracefully the removal and re-attachment of all QScreens
Don't crash; restore windows when all screens are removed and re-added.
xcb: on configure notify, check for screen change: it may be that a
window belonging to a screen which was removed has now gotten mapped
to the new screen. On screen change, send a synthetic expose event,
because the real expose events already happened.
Task-number: QTBUG-38326
Task-number: QTBUG-32973
Task-number: QTBUG-42985
Change-Id: If334f55c248468ad3c95e7066bb14eca377d2050
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'src/gui/kernel/qwindow_p.h')
| -rw-r--r-- | src/gui/kernel/qwindow_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h index c496d7716b..9151e76ea4 100644 --- a/src/gui/kernel/qwindow_p.h +++ b/src/gui/kernel/qwindow_p.h @@ -45,6 +45,7 @@ // We mean it. // +#include <QtGui/qscreen.h> #include <QtGui/qwindow.h> #include <qpa/qplatformwindow.h> @@ -73,6 +74,7 @@ public: , parentWindow(0) , platformWindow(0) , visible(false) + , visibilityOnDestroy(false) , exposed(false) , windowState(Qt::WindowNoState) , visibility(QWindow::Hidden) @@ -147,6 +149,7 @@ public: QWindow *parentWindow; QPlatformWindow *platformWindow; bool visible; + bool visibilityOnDestroy; bool exposed; QSurfaceFormat requestedFormat; QString windowTitle; @@ -175,7 +178,7 @@ public: int updateTimer; QPointer<QWindow> transientParent; - QScreen *topLevelScreen; + QPointer<QScreen> topLevelScreen; #ifndef QT_NO_CURSOR QCursor cursor; |