summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@digia.com>2013-04-19 11:20:37 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-26 16:21:35 +0200
commit08f0b5dbc41d67f93c58426d7c8e82f21c9f469b (patch)
tree40206705e4fa849a02b3e75cad0892ef7948e7c7 /src/plugins/platforms
parentff9b3fcf6994fa3b3dc8de549298f06023e9a7a8 (diff)
iOS: stack true popup windows ontop of tool windows
The current implementation would never hit the Qt::Tool case, since a tool is also a Qt::Popup. This patch fixes that by making the logic more explicit. Change-Id: I0e6898081a18289e1007c8a168b374740915b3ff Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r--src/plugins/platforms/ios/qioswindow.mm4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm
index c138df8441..b173fb786f 100644
--- a/src/plugins/platforms/ios/qioswindow.mm
+++ b/src/plugins/platforms/ios/qioswindow.mm
@@ -482,8 +482,10 @@ void QIOSWindow::updateWindowLevel()
else if (window()->flags() & Qt::WindowStaysOnTopHint)
m_windowLevel = 100;
else if (window()->isModal())
+ m_windowLevel = 40;
+ else if (type == Qt::Popup)
m_windowLevel = 30;
- else if (windowIsPopup())
+ else if (type == Qt::SplashScreen)
m_windowLevel = 20;
else if (type == Qt::Tool)
m_windowLevel = 10;