Rely on SDL for Android fullscreen window behavior

This commit is contained in:
Joshua Granick
2019-10-08 13:41:36 -07:00
parent 274ae5fe3b
commit bb2af5eed1
2 changed files with 203 additions and 241 deletions

View File

@@ -45,7 +45,11 @@ namespace lime {
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;
#endif
if (flags & WINDOW_FLAG_RESIZABLE) sdlWindowFlags |= SDL_WINDOW_RESIZABLE;
if (flags & WINDOW_FLAG_BORDERLESS) sdlWindowFlags |= SDL_WINDOW_BORDERLESS;
if (flags & WINDOW_FLAG_HIDDEN) sdlWindowFlags |= SDL_WINDOW_HIDDEN;
@@ -163,6 +167,7 @@ namespace lime {
if (!sdlWindow) {
printf ("Could not create SDL window: %s.\n", SDL_GetError ());
return;
}
@@ -289,6 +294,14 @@ namespace lime {
}
#ifdef ANDROID
// TODO: Is this extra call needed?
if (flags & WINDOW_FLAG_FULLSCREEN)
{
SetFullscreen(true);
}
#endif
}
@@ -925,6 +938,9 @@ namespace lime {
if (fullscreen) {
#ifdef ANDROID
SDL_SetWindowFullscreen (sdlWindow, SDL_WINDOW_FULLSCREEN);
#else
if (displayModeSet) {
SDL_SetWindowFullscreen (sdlWindow, SDL_WINDOW_FULLSCREEN);
@@ -934,6 +950,7 @@ namespace lime {
SDL_SetWindowFullscreen (sdlWindow, SDL_WINDOW_FULLSCREEN_DESKTOP);
}
#endif
} else {