Restore the desktop mode when requested

libsdl-org · Dec 2, 2009 · 7db67d3 · 7db67d3
1 parent 359a8f3
commit 7db67d3
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/src/video/cocoa/SDL_cocoamodes.m b/src/video/cocoa/SDL_cocoamodes.m
@@ -247,16 +247,25 @@ - (void) setFrame:(NSRect)frame;
         goto ERR_NO_CAPTURE;
     }
 
-    /* Do the physical switch */
-    result = CGDisplaySwitchToMode(displaydata->display, data->moderef);
-    if (result != kCGErrorSuccess) {
-        CG_SetError("CGDisplaySwitchToMode()", result);
-        goto ERR_NO_SWITCH;
-    }
+    if (data == display->desktop_mode.driverdata) {
+        /* Restoring desktop mode */
+        CGDisplayRelease(displaydata->display);
+
+        if (CGDisplayIsMain(displaydata->display)) {
+            ShowMenuBar();
+        }
+    } else {
+        /* Do the physical switch */
+        result = CGDisplaySwitchToMode(displaydata->display, data->moderef);
+        if (result != kCGErrorSuccess) {
+            CG_SetError("CGDisplaySwitchToMode()", result);
+            goto ERR_NO_SWITCH;
+        }
 
-    /* Hide the menu bar so it doesn't intercept events */
-    if (CGDisplayIsMain(displaydata->display)) {
-        HideMenuBar();
+        /* Hide the menu bar so it doesn't intercept events */
+        if (CGDisplayIsMain(displaydata->display)) {
+            HideMenuBar();
+        }
     }
 
     /* Fade in again (asynchronously) */