Mac: Fix returning to the window's Space in OS X 10.11+ when SDL_WIND…

…OW_FULLSCREEN_DESKTOP is used (bug #3152.)
libsdl-org · Oct 23, 2015 · f8824cb · f8824cb
1 parent 4c72d39
commit f8824cb
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m
@@ -1602,8 +1602,10 @@ - (void)resetCursorRects
     }
 
     if ( data && (window->flags & SDL_WINDOW_FULLSCREEN) ) {
-        if (SDL_ShouldAllowTopmost() && (window->flags & SDL_WINDOW_INPUT_FOCUS)) {
+        if (SDL_ShouldAllowTopmost() && (window->flags & SDL_WINDOW_INPUT_FOCUS)
+            && ![data->listener isInFullscreenSpace]) {
             /* OpenGL is rendering to the window, so make it visible! */
+            /* Doing this in 10.11 while in a Space breaks things (bug #3152) */
             [data->nswindow setLevel:CGShieldingWindowLevel()];
         } else {
             [data->nswindow setLevel:kCGNormalWindowLevel];