iOS: add convenience functions for getting window type

Change-Id: I971df06dd348d1da68578e04076a02e85866e141
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
bb10
Richard Moe Gustavsen 2013-04-26 10:05:18 +02:00 committed by The Qt Project
parent fca94fa5ed
commit ff9b3fcf69
2 changed files with 5 additions and 2 deletions

View File

@ -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

View File

@ -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;