Commit 0e5cc8dff476d7f4a14b7f3f6f837d5114f3cdf5

Ryan C. Gordon 2014-03-02T22:51:31

Mac: Don't lose the menu/dock when switching back to a resizable window Space.

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m
index 0fe8cee..06ecd62 100644
--- a/src/video/cocoa/SDL_cocoawindow.m
+++ b/src/video/cocoa/SDL_cocoawindow.m
@@ -509,7 +509,7 @@ SetWindowStyle(SDL_Window * window, unsigned int style)
     /* Check to see if someone updated the clipboard */
     Cocoa_CheckClipboardUpdate(_data->videodata);
 
-    if (isFullscreenSpace) {
+    if ((isFullscreenSpace) && ((window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP)) {
         [NSMenu setMenuBarVisible:NO];
     }
 }