diff options
| author | Richard Moe Gustavsen <richard.gustavsen@digia.com> | 2013-04-26 10:05:18 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-26 16:21:35 +0200 |
| commit | ff9b3fcf6994fa3b3dc8de549298f06023e9a7a8 (patch) | |
| tree | 53d5e1e86619f92bc32f37e9fad3d2d9af737eaa /src/plugins/platforms/ios | |
| parent | fca94fa5ed8321e84e7b0ff515620fbb901db545 (diff) | |
iOS: add convenience functions for getting window type
Change-Id: I971df06dd348d1da68578e04076a02e85866e141
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src/plugins/platforms/ios')
| -rw-r--r-- | src/plugins/platforms/ios/qioswindow.h | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/qioswindow.mm | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/platforms/ios/qioswindow.h b/src/plugins/platforms/ios/qioswindow.h index cefb6f9388..2ceb82f0ef 100644 --- a/src/plugins/platforms/ios/qioswindow.h +++ b/src/plugins/platforms/ios/qioswindow.h @@ -96,6 +96,9 @@ private: void raiseOrLower(bool raise); void updateWindowLevel(); bool blockedByModal(); + + inline Qt::WindowType windowType() { return static_cast<Qt::WindowType>(int(window()->flags() & Qt::WindowType_Mask)); } + inline bool windowIsPopup() { return windowType() & Qt::Popup & ~Qt::Window; } }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm index 5edf81af93..c138df8441 100644 --- a/src/plugins/platforms/ios/qioswindow.mm +++ b/src/plugins/platforms/ios/qioswindow.mm @@ -475,7 +475,7 @@ 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; @@ -483,7 +483,7 @@ void QIOSWindow::updateWindowLevel() m_windowLevel = 100; else if (window()->isModal()) m_windowLevel = 30; - else if (type & Qt::Popup & ~Qt::Window) + else if (windowIsPopup()) m_windowLevel = 20; else if (type == Qt::Tool) m_windowLevel = 10; |