diff options
| author | Paul Olav Tvete <paul.tvete@digia.com> | 2014-08-20 12:21:30 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@digia.com> | 2014-08-20 18:38:18 +0200 |
| commit | 8688dfcd7ce148a8e7fcd16521d458417eadcbf8 (patch) | |
| tree | 4f61ae37ba7901dbd1bb2f00eae5c436c304b1e0 /src/gui | |
| parent | 9b11f0bac8f4a6b3c0b960e40bf74830eb5c1056 (diff) | |
Android: use correct size when leaving fullscreen
On Android, fullscreen means enabling "immersive mode", which
results in the screen available geometry changing. When restoring
normal mode, oldAvailableGeometry == oldGeometry, which means that
the fullscreen branch would be chosen even though the state is not
fullscreen. By doing the maximized test first, we will default to
non-fullscreen geometry for non-fullscreen windows.
Task-number: QTBUG-39977
Change-Id: Ifc7e8b4de7e96d8c00603ce0cd136b95f58012bb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qplatformscreen.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qplatformscreen.cpp b/src/gui/kernel/qplatformscreen.cpp index 05d04ae4ee..6bf7915425 100644 --- a/src/gui/kernel/qplatformscreen.cpp +++ b/src/gui/kernel/qplatformscreen.cpp @@ -314,10 +314,10 @@ void QPlatformScreen::resizeMaximizedWindows() if (platformScreenForWindow(w) != this) continue; - if (w->windowState() & Qt::WindowFullScreen || w->geometry() == oldGeometry) - w->setGeometry(newGeometry); - else if (w->windowState() & Qt::WindowMaximized || w->geometry() == oldAvailableGeometry) + if (w->windowState() & Qt::WindowMaximized || w->geometry() == oldAvailableGeometry) w->setGeometry(newAvailableGeometry); + else if (w->windowState() & Qt::WindowFullScreen || w->geometry() == oldGeometry) + w->setGeometry(newGeometry); } } |