kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use SDL_WINDOW_FULLSCREEN_DESKTOP instead of SDL_WINDOW_FULLSCREEN to behave better on OS X (until we have an official display mode switch API for regular fullscreen) (closes #235)

Browse Source
This commit is contained in:
Joshua Granick
2015-02-23 15:47:00 -08:00
parent 139293adf5
commit df735ef734
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/project/src/sdl2/SDL2Stage.cpp
View File

@@ -363,7 +363,7 @@ public:
mode.h = sgDesktopHeight; mode.h = sgDesktopHeight;
SDL_SetWindowDisplayMode(mSDLWindow, &mode); SDL_SetWindowDisplayMode(mSDLWindow, &mode);
SDL_SetWindowFullscreen(mSDLWindow, SDL_WINDOW_FULLSCREEN /*SDL_WINDOW_FULLSCREEN_DESKTOP*/); SDL_SetWindowFullscreen(mSDLWindow, SDL_WINDOW_FULLSCREEN_DESKTOP /*SDL_WINDOW_FULLSCREEN_DESKTOP*/);
} }
else else
{ {
@@ -392,7 +392,7 @@ public:
mode.h = inHeight; mode.h = inHeight;
SDL_SetWindowFullscreen(mSDLWindow, 0); SDL_SetWindowFullscreen(mSDLWindow, 0);
SDL_SetWindowDisplayMode(mSDLWindow, &mode); SDL_SetWindowDisplayMode(mSDLWindow, &mode);
SDL_SetWindowFullscreen(mSDLWindow, SDL_WINDOW_FULLSCREEN); SDL_SetWindowFullscreen(mSDLWindow, SDL_WINDOW_FULLSCREEN_DESKTOP);
} }
@@ -519,7 +519,7 @@ public:
} }
SDL_SetWindowFullscreen(mSDLWindow, 0); SDL_SetWindowFullscreen(mSDLWindow, 0);
SDL_SetWindowDisplayMode(mSDLWindow, &mode); SDL_SetWindowDisplayMode(mSDLWindow, &mode);
SDL_SetWindowFullscreen(mSDLWindow, SDL_WINDOW_FULLSCREEN); SDL_SetWindowFullscreen(mSDLWindow, SDL_WINDOW_FULLSCREEN_DESKTOP);
} }
@@ -1455,7 +1455,7 @@ void CreateMainFrame(FrameCreationCallback inOnFrame, int inWidth, int inHeight,
if (opengl) requestWindowFlags |= SDL_WINDOW_OPENGL; if (opengl) requestWindowFlags |= SDL_WINDOW_OPENGL;
if (resizable) requestWindowFlags |= SDL_WINDOW_RESIZABLE; if (resizable) requestWindowFlags |= SDL_WINDOW_RESIZABLE;
if (borderless) requestWindowFlags |= SDL_WINDOW_BORDERLESS; if (borderless) requestWindowFlags |= SDL_WINDOW_BORDERLESS;
if (fullscreen) requestWindowFlags |= SDL_WINDOW_FULLSCREEN; //SDL_WINDOW_FULLSCREEN_DESKTOP; if (fullscreen) requestWindowFlags |= SDL_WINDOW_FULLSCREEN_DESKTOP; //SDL_WINDOW_FULLSCREEN_DESKTOP;
if (opengl) if (opengl)
{ {

2
project/src/backend/sdl/SDLWindow.cpp
View File

@@ -17,7 +17,7 @@ namespace lime {
int sdlFlags = SDL_WINDOW_OPENGL; int sdlFlags = SDL_WINDOW_OPENGL;
if (flags & WINDOW_FLAG_FULLSCREEN) sdlFlags |= SDL_WINDOW_FULLSCREEN; if (flags & WINDOW_FLAG_FULLSCREEN) sdlFlags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
if (flags & WINDOW_FLAG_RESIZABLE) sdlFlags |= SDL_WINDOW_RESIZABLE; if (flags & WINDOW_FLAG_RESIZABLE) sdlFlags |= SDL_WINDOW_RESIZABLE;
if (flags & WINDOW_FLAG_BORDERLESS) sdlFlags |= SDL_WINDOW_BORDERLESS; if (flags & WINDOW_FLAG_BORDERLESS) sdlFlags |= SDL_WINDOW_BORDERLESS;