diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-30 09:33:19 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-30 09:33:19 +0200 |
| commit | c917579a15d60a7b70c5fc5f00f6451da7c4e608 (patch) | |
| tree | 1c89cd1f66ff5147e494a6493e81239e4a644911 /src/plugins/platforms/ios/qioswindow.mm | |
| parent | ac06bfdc76414c8d8c727ff5278b1baafe610860 (diff) | |
| parent | 85e3c53e5c5e2de993c90ece324a68d0ff62f417 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/ios/qioswindow.mm')
| -rw-r--r-- | src/plugins/platforms/ios/qioswindow.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm index 5edf81af93..b173fb786f 100644 --- a/src/plugins/platforms/ios/qioswindow.mm +++ b/src/plugins/platforms/ios/qioswindow.mm @@ -475,15 +475,17 @@ void QIOSWindow::raiseOrLower(bool raise) void QIOSWindow::updateWindowLevel() { - Qt::WindowType type = static_cast<Qt::WindowType>(int(window()->flags() & Qt::WindowType_Mask)); + Qt::WindowType type = windowType(); if (type == Qt::ToolTip) m_windowLevel = 120; 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 (type & Qt::Popup & ~Qt::Window) + else if (type == Qt::SplashScreen) m_windowLevel = 20; else if (type == Qt::Tool) m_windowLevel = 10; |