Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Fixed cocoa trying to shuffling windows when going fullscreen on the …

…main display.
  • Loading branch information
slouken committed Feb 11, 2011
1 parent 8293760 commit 316dd288f621ab6004250385255d05dce2763d8d
Showing with 11 additions and 2 deletions.
  1. +11 −2 src/video/cocoa/SDL_cocoamodes.m
@@ -258,14 +258,23 @@ - (void) setFrame:(NSRect)frame;
/* Restoring desktop mode */
CGDisplaySwitchToMode(displaydata->display, data->moderef);

CGDisplayRelease(displaydata->display);
if (CGDisplayIsMain(displaydata->display)) {
CGReleaseAllDisplays();
} else {
CGDisplayRelease(displaydata->display);
}

if (CGDisplayIsMain(displaydata->display)) {
ShowMenuBar();
}
} else {
/* Put up the blanking window (a window above all other windows) */
result = CGDisplayCapture(displaydata->display);
if (CGDisplayIsMain(displaydata->display)) {
/* If we don't capture all displays, Cocoa tries to rearrange windows... *sigh* */
result = CGCaptureAllDisplays();
} else {
result = CGDisplayCapture(displaydata->display);
}
if (result != kCGErrorSuccess) {
CG_SetError("CGDisplayCapture()", result);
goto ERR_NO_CAPTURE;

0 comments on commit 316dd28

Please sign in to comment.