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

Revert unneeded window changes for Android fullscreen

Browse Source
This commit is contained in:
Joshua Granick
2019-10-09 11:52:41 -07:00
parent bb2af5eed1
commit 3000f74f06
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,11 +45,7 @@ namespace lime {
int sdlWindowFlags = 0; int sdlWindowFlags = 0;
#ifdef ANDROID
if (flags & WINDOW_FLAG_FULLSCREEN) sdlWindowFlags |= SDL_WINDOW_FULLSCREEN;
#else
if (flags & WINDOW_FLAG_FULLSCREEN) sdlWindowFlags |= SDL_WINDOW_FULLSCREEN_DESKTOP; if (flags & WINDOW_FLAG_FULLSCREEN) sdlWindowFlags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
#endif
if (flags & WINDOW_FLAG_RESIZABLE) sdlWindowFlags |= SDL_WINDOW_RESIZABLE; if (flags & WINDOW_FLAG_RESIZABLE) sdlWindowFlags |= SDL_WINDOW_RESIZABLE;
if (flags & WINDOW_FLAG_BORDERLESS) sdlWindowFlags |= SDL_WINDOW_BORDERLESS; if (flags & WINDOW_FLAG_BORDERLESS) sdlWindowFlags |= SDL_WINDOW_BORDERLESS;
if (flags & WINDOW_FLAG_HIDDEN) sdlWindowFlags |= SDL_WINDOW_HIDDEN; if (flags & WINDOW_FLAG_HIDDEN) sdlWindowFlags |= SDL_WINDOW_HIDDEN;
@@ -294,14 +290,6 @@ namespace lime {
} }
#ifdef ANDROID
// TODO: Is this extra call needed?
if (flags & WINDOW_FLAG_FULLSCREEN)
{
SetFullscreen(true);
}
#endif
} }
@@ -938,9 +926,6 @@ namespace lime {
if (fullscreen) { if (fullscreen) {
#ifdef ANDROID
SDL_SetWindowFullscreen (sdlWindow, SDL_WINDOW_FULLSCREEN);
#else
if (displayModeSet) { if (displayModeSet) {
SDL_SetWindowFullscreen (sdlWindow, SDL_WINDOW_FULLSCREEN); SDL_SetWindowFullscreen (sdlWindow, SDL_WINDOW_FULLSCREEN);
@@ -950,7 +935,6 @@ namespace lime {
SDL_SetWindowFullscreen (sdlWindow, SDL_WINDOW_FULLSCREEN_DESKTOP); SDL_SetWindowFullscreen (sdlWindow, SDL_WINDOW_FULLSCREEN_DESKTOP);
} }
#endif
} else { } else {