gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Don't raise the parent top-level window when raising a child window, only raise the child window to the top of the parent

Browse Source
This commit is contained in:
Sam Lantinga
2023-08-30 20:29:57 -07:00
parent a5e7214795
commit a7eea9997d
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/video/cocoa/SDL_cocoawindow.m
View File

@@ -2170,7 +2170,7 @@ void Cocoa_ShowWindow(SDL_VideoDevice *_this, SDL_Window *window)
if (SDL_WINDOW_IS_POPUP(window)) { if (SDL_WINDOW_IS_POPUP(window)) {
NSWindow *nsparent = ((__bridge SDL_CocoaWindowData *)window->parent->driverdata).nswindow; NSWindow *nsparent = ((__bridge SDL_CocoaWindowData *)window->parent->driverdata).nswindow;
[nsparent addChildWindow:nswindow ordered:NSWindowAbove]; [nsparent addChildWindow:nswindow ordered:NSWindowAbove];
} } else {
if (bActivate) { if (bActivate) {
[nswindow makeKeyAndOrderFront:nil]; [nswindow makeKeyAndOrderFront:nil];
} else { } else {
@@ -2178,8 +2178,9 @@ void Cocoa_ShowWindow(SDL_VideoDevice *_this, SDL_Window *window)
if ([NSApp keyWindow]) { if ([NSApp keyWindow]) {
[nswindow orderWindow:NSWindowBelow relativeTo:[[NSApp keyWindow] windowNumber]]; [nswindow orderWindow:NSWindowBelow relativeTo:[[NSApp keyWindow] windowNumber]];
} }
[nswindow setIsVisible:YES];
} }
}
[nswindow setIsVisible:YES];
[windowData.listener resumeVisibleObservation]; [windowData.listener resumeVisibleObservation];
} }
} }
@@ -2234,8 +2235,7 @@ void Cocoa_RaiseWindow(SDL_VideoDevice *_this, SDL_Window *window)
if (SDL_WINDOW_IS_POPUP(window)) { if (SDL_WINDOW_IS_POPUP(window)) {
NSWindow *nsparent = ((__bridge SDL_CocoaWindowData *)window->parent->driverdata).nswindow; NSWindow *nsparent = ((__bridge SDL_CocoaWindowData *)window->parent->driverdata).nswindow;
[nsparent addChildWindow:nswindow ordered:NSWindowAbove]; [nsparent addChildWindow:nswindow ordered:NSWindowAbove];
} } else {
if (bActivate) { if (bActivate) {
[NSApp activateIgnoringOtherApps:YES]; [NSApp activateIgnoringOtherApps:YES];
[nswindow makeKeyAndOrderFront:nil]; [nswindow makeKeyAndOrderFront:nil];
@@ -2243,6 +2243,7 @@ void Cocoa_RaiseWindow(SDL_VideoDevice *_this, SDL_Window *window)
[nswindow orderFront:nil]; [nswindow orderFront:nil];
} }
} }
}
[windowData.listener resumeVisibleObservation]; [windowData.listener resumeVisibleObservation];
} }
} }