From 08f0b5dbc41d67f93c58426d7c8e82f21c9f469b Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Fri, 19 Apr 2013 11:20:37 +0200 Subject: iOS: stack true popup windows ontop of tool windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ø --- src/plugins/platforms/ios/qioswindow.mm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') 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; -- cgit v1.2.3