AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cocoa: set window levels when creating NSWindow/NSPanel

Browse Source 
Port the QWidgetPrivate::setWindowLevel() function from Qt 4 so that we
get compatible window level behavior in Qt 5.

Change-Id: I67f036941f1e460be678b28e7079d36b1a6622ac
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
This commit is contained in:
Bradley T. Hughes 2012-03-28 09:21:15 +02:00 committed by Qt by Nokia
parent 177a78b035
commit 5211d17864
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/platforms/cocoa/qcocoawindow.mm
View File

@ -365,6 +365,30 @@ NSWindow * QCocoaWindow::createNSWindow()
NSUInteger styleMask; NSUInteger styleMask;
NSWindow *createdWindow = 0; NSWindow *createdWindow = 0;
NSInteger windowLevel = -1;
if (type == Qt::Tool) {
windowLevel = NSFloatingWindowLevel;
} else if ((type & Qt::Popup) == Qt::Popup) {
// styleMask = NSBorderlessWindowMask;
windowLevel = NSPopUpMenuWindowLevel;
// Popup should be in at least the same level as its parent.
const QWindow * const transientParent = window()->transientParent();
const QCocoaWindow * const transientParentWindow = transientParent ? static_cast<QCocoaWindow *>(transientParent->handle()) : 0;
if (transientParentWindow)
windowLevel = qMax([transientParentWindow->m_nsWindow level], windowLevel);
}
// StayOnTop window should appear above Tool windows.
if (flags & Qt::WindowStaysOnTopHint)
windowLevel = NSPopUpMenuWindowLevel;
// Tooltips should appear above StayOnTop windows.
if (type == Qt::ToolTip)
windowLevel = NSScreenSaverWindowLevel;
// All other types are Normal level.
if (windowLevel == -1)
windowLevel = NSNormalWindowLevel;
// Use NSPanel for popup-type windows. (Popup, Tool, ToolTip, SplashScreen) // Use NSPanel for popup-type windows. (Popup, Tool, ToolTip, SplashScreen)
if ((type & Qt::Popup) == Qt::Popup) { if ((type & Qt::Popup) == Qt::Popup) {
@ -404,6 +428,9 @@ NSWindow * QCocoaWindow::createNSWindow()
createdWindow = window; createdWindow = window;
} }
[createdWindow setLevel:windowLevel];
return createdWindow; return createdWindow;
} }