Skip to content
Permalink
Browse files

Fixed bug 2479 - [OS X] SDL_SetWindowFullscreen fails to switch to wi…

…ndowed

Eric Wasylishen

The problem seems to be the spaces handling code in -setFullscreenSpace: (SDL_cocoawindow.m) is incorrectly reporting that the SDL_WINDOW_FULLSCREEN -> windowed transition has already happened.

i.e. I saw this case was getting hit when trying to leave SDL_WINDOW_FULLSCREEN:

"else if (state == isFullscreenSpace) {
    return YES;  /* already there. */
}"

With the attached patch, both Control+Enter (SDL_WINDOW_FULLSCREEN toggle) and Option+Enter (SDL_WINDOW_FULLSCREEN_DESKTOP toggle) work in an sdl test app (I tried testwm2). Tested on OS X 10.9.2.
  • Loading branch information
slouken committed Jun 2, 2014
1 parent 75c57f8 commit 3905b910f3f9bf8678eafcc6b69c1134e5d25b71
Showing with 2 additions and 0 deletions.
  1. +2 −0 src/video/cocoa/SDL_cocoawindow.m
@@ -268,6 +268,8 @@ -(BOOL) setFullscreenSpace:(BOOL) state
return NO; /* Spaces are forcibly disabled. */
} else if (state && ((window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) != SDL_WINDOW_FULLSCREEN_DESKTOP)) {
return NO; /* we only allow you to make a Space on FULLSCREEN_DESKTOP windows. */
} else if (!state && ((window->last_fullscreen_flags & SDL_WINDOW_FULLSCREEN_DESKTOP) != SDL_WINDOW_FULLSCREEN_DESKTOP)) {
return NO; /* we only handle leaving the Space on windows that were previously FULLSCREEN_DESKTOP. */
} else if (state == isFullscreenSpace) {
return YES; /* already there. */
}

0 comments on commit 3905b91

Please sign in to comment.