Rely on SDL for Android fullscreen window behavior

openfl · Oct 8, 2019 · bb2af5e · bb2af5e
1 parent 274ae5f
commit bb2af5e
Show file tree

Hide file tree

Showing 2 changed files with 203 additions and 241 deletions.
diff --git a/project/src/backend/sdl/SDLWindow.cpp b/project/src/backend/sdl/SDLWindow.cpp
@@ -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 {