Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a lower level for wxSTAY_ON_TOP frames in wxOSX

Browse Source 
Use NSModalPanelWindowLevel instead of kCGUtilityWindowLevel. This
prevents dialogs parented to stay-on-top frames from ending up behind their
parent.
This commit is contained in:
Lauri Nurmi
2017-02-10 21:54:22 +02:00
parent a9a980a71b
commit 246fa6aa98
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/osx/cocoa/nonownedwnd.mm
View File

@@ -709,10 +709,10 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
windowstyle |= NSTexturedBackgroundWindowMask; windowstyle |= NSTexturedBackgroundWindowMask;
if ( ( style & wxFRAME_FLOAT_ON_PARENT ) || ( style & wxFRAME_TOOL_WINDOW ) ) if ( ( style & wxFRAME_FLOAT_ON_PARENT ) || ( style & wxFRAME_TOOL_WINDOW ) )
level = kCGFloatingWindowLevel; level = NSFloatingWindowLevel;
if ( ( style & wxSTAY_ON_TOP ) ) if ( ( style & wxSTAY_ON_TOP ) )
level = kCGUtilityWindowLevel; level = NSModalPanelWindowLevel;
NSRect r = wxToNSRect( NULL, wxRect( pos, size) ); NSRect r = wxToNSRect( NULL, wxRect( pos, size) );
@@ -734,20 +734,20 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
} }
// If the parent is modal, windows with wxFRAME_FLOAT_ON_PARENT style need // If the parent is modal, windows with wxFRAME_FLOAT_ON_PARENT style need
// to be in kCGUtilityWindowLevel and not kCGFloatingWindowLevel to stay // to be in NSModalPanelWindowLevel and not NSFloatingWindowLevel to stay
// above the parent. // above the parent.
wxDialog * const parentDialog = parent == NULL ? NULL : wxDynamicCast(parent->MacGetTopLevelWindow(), wxDialog); wxDialog * const parentDialog = parent == NULL ? NULL : wxDynamicCast(parent->MacGetTopLevelWindow(), wxDialog);
if (parentDialog && parentDialog->IsModal()) if (parentDialog && parentDialog->IsModal())
{ {
if (level == kCGFloatingWindowLevel) if (level == NSFloatingWindowLevel)
{ {
level = kCGUtilityWindowLevel; level = NSModalPanelWindowLevel;
} }
// Cocoa's modal loop does not process other windows by default, but // Cocoa's modal loop does not process other windows by default, but
// don't call this on normal window levels so nested modal dialogs will // don't call this on normal window levels so nested modal dialogs will
// still behave modally. // still behave modally.
if (level != kCGNormalWindowLevel) if (level != NSNormalWindowLevel)
{ {
if ([m_macWindow isKindOfClass:[NSPanel class]]) if ([m_macWindow isKindOfClass:[NSPanel class]])
{ {
@@ -815,10 +815,11 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show)
if ( parentNSWindow ) { if ( parentNSWindow ) {
[parentNSWindow addChildWindow:m_macWindow ordered:NSWindowAbove]; [parentNSWindow addChildWindow:m_macWindow ordered:NSWindowAbove];
// If the parent is modal, windows with wxFRAME_FLOAT_ON_PARENT style need // If the parent is modal, windows with wxFRAME_FLOAT_ON_PARENT style need
// to be in kCGUtilityWindowLevel and not kCGFloatingWindowLevel to stay // to be in NSModalPanelWindowLevel and not NSFloatingWindowLevel to stay
// above the parent. // above the parent.
if ([m_macWindow level] == kCGFloatingWindowLevel) { if ([m_macWindow level] == NSFloatingWindowLevel ||
m_macWindowLevel = kCGUtilityWindowLevel; [m_macWindow level] == NSModalPanelWindowLevel) {
m_macWindowLevel = NSModalPanelWindowLevel;
[m_macWindow setLevel:m_macWindowLevel]; [m_macWindow setLevel:m_macWindowLevel];
} }
} }
@@ -892,9 +893,9 @@ void wxNonOwnedWindowCocoaImpl::SetWindowStyleFlag( long style )
CGWindowLevel level = kCGNormalWindowLevel; CGWindowLevel level = kCGNormalWindowLevel;
if (style & wxSTAY_ON_TOP) if (style & wxSTAY_ON_TOP)
level = kCGUtilityWindowLevel; level = NSModalPanelWindowLevel;
else if (( style & wxFRAME_FLOAT_ON_PARENT ) || ( style & wxFRAME_TOOL_WINDOW )) else if (( style & wxFRAME_FLOAT_ON_PARENT ) || ( style & wxFRAME_TOOL_WINDOW ))
level = kCGFloatingWindowLevel; level = NSFloatingWindowLevel;
[m_macWindow setLevel: level]; [m_macWindow setLevel: level];
m_macWindowLevel = level; m_macWindowLevel = level;