Skip to content
Permalink
Browse files
Fullscreen mode is fixed on OS X
  • Loading branch information
duganchen committed Mar 3, 2017
1 parent 06dc6b7 commit b69f01f63458e4e80e8855380e99f81f16118d51
Showing with 14 additions and 0 deletions.
  1. +14 −0 src/gui/sdlmain.cpp
@@ -488,12 +488,21 @@ static SDL_Window * GFX_SetSDLWindowMode(Bit16u width, Bit16u height, bool fulls
if (sdl.window) {
SDL_DestroyWindow(sdl.window);
}
#if defined(MACOSX)
sdl.window = SDL_CreateWindow("",
SDL_WINDOWPOS_UNDEFINED_DISPLAY(sdl.displayNumber),
SDL_WINDOWPOS_UNDEFINED_DISPLAY(sdl.displayNumber),
width, height,
(fullscreen ? SDL_WINDOW_FULLSCREEN : 0)
| ((screenType == SCREEN_OPENGL) ? SDL_WINDOW_OPENGL : 0) | SDL_WINDOW_SHOWN);
#else
sdl.window = SDL_CreateWindow("",
SDL_WINDOWPOS_UNDEFINED_DISPLAY(sdl.displayNumber),
SDL_WINDOWPOS_UNDEFINED_DISPLAY(sdl.displayNumber),
width, height,
(fullscreen ? (sdl.desktop.full.display_res ? SDL_WINDOW_FULLSCREEN_DESKTOP : SDL_WINDOW_FULLSCREEN) : 0)
| ((screenType == SCREEN_OPENGL) ? SDL_WINDOW_OPENGL : 0) | SDL_WINDOW_SHOWN);
#endif
if (sdl.window)
GFX_SetTitle(-1,-1,false); //refresh title.
SDL_GetWindowSize(sdl.window, &currWidth, &currHeight);
@@ -515,7 +524,12 @@ static SDL_Window * GFX_SetSDLWindowMode(Bit16u width, Bit16u height, bool fulls
displayMode.h = height;
SDL_SetWindowDisplayMode(sdl.window, &displayMode);

#if defined(MACOSX)
SDL_SetWindowFullscreen(sdl.window, SDL_WINDOW_FULLSCREEN);
#else
SDL_SetWindowFullscreen(sdl.window, SDL_WINDOW_FULLSCREEN_DESKTOP);
#endif

} else {
SDL_SetWindowFullscreen(sdl.window, 0);

0 comments on commit b69f01f

Please sign in to comment.