From f93c2e774a51b668c592253817e8de5a7dcdd0f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20P=2E=20Tjern=C3=B8?= Date: Wed, 15 Jan 2014 11:31:56 -0800 Subject: [PATCH] Mac: Don't give windows focus back when we're closing them. Fixes bug #1840 (https://bugzilla.libsdl.org/show_bug.cgi?id=1840) --HG-- extra : histedit_source : bd88f90110eb00ed9572073f7cc39a53e22a5d1b --- src/video/cocoa/SDL_cocoawindow.m | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m index 0ed653159..f7a03915b 100644 --- a/src/video/cocoa/SDL_cocoawindow.m +++ b/src/video/cocoa/SDL_cocoawindow.m @@ -299,9 +299,14 @@ SetWindowStyle(SDL_Window * window, unsigned int style) !!! FIXME: http://bugzilla.libsdl.org/show_bug.cgi?id=1825 */ windows = [NSApp orderedWindows]; - if ([windows count] > 0) { - NSWindow *win = (NSWindow *) [windows objectAtIndex:0]; + for (NSWindow *win in windows) + { + if (win == window) { + continue; + } + [win makeKeyAndOrderFront:self]; + break; } }