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>
This commit is contained in:
Richard Moe Gustavsen 2013-04-19 11:20:37 +02:00 committed by The Qt Project
parent ff9b3fcf69
commit 08f0b5dbc4

View File

@ -482,8 +482,10 @@ void QIOSWindow::updateWindowLevel()
else if (window()->flags() & Qt::WindowStaysOnTopHint) else if (window()->flags() & Qt::WindowStaysOnTopHint)
m_windowLevel = 100; m_windowLevel = 100;
else if (window()->isModal()) else if (window()->isModal())
m_windowLevel = 40;
else if (type == Qt::Popup)
m_windowLevel = 30; m_windowLevel = 30;
else if (windowIsPopup()) else if (type == Qt::SplashScreen)
m_windowLevel = 20; m_windowLevel = 20;
else if (type == Qt::Tool) else if (type == Qt::Tool)
m_windowLevel = 10; m_windowLevel = 10;