Merge branch 'master' of https://github.com/pionere/devilutionX into android

Author: pionere

Source/utils/display.cpp

@@ -82,9 +82,12 @@ void SetVideoMode(int width, int height, int bpp, uint32_t flags)
 		sdl_error(ERR_SDL_DISPLAY_MODE_SET);
 	}
 #if DEBUG_MODE
-	const SDL_VideoInfo* current = SDL_GetVideoInfo();
-	DoLog("Video mode is now %dx%d bpp=%d flags=0x%08X",
-	    current->current_w, current->current_h, current->vfmt->BitsPerPixel, SDL_GetVideoSurface()->flags);
+	const SDL_Surface *surface = SDL_GetVideoSurface();
+	if (surface == NULL) {
+		sdl_error(ERR_SDL_DISPLAY_MODE_SET);
+	}
+	DoLog("Video surface is now %dx%d bpp=%d flags=0x%08X",
+	    surface->w, surface->h, surface->format->BitsPerPixel, surface->flags);
 #endif
 }
 
@@ -266,9 +269,12 @@ void SpawnWindow()
 	if (grabInput)
 		SDL_WM_GrabInput(SDL_GRAB_ON);
 	atexit(SDL_VideoQuit); // Without this video mode is not restored after fullscreen.
-	const SDL_VideoInfo* current = SDL_GetVideoInfo();
-	width = current->current_w;
-	height = current->current_h;
+	const SDL_Surface *surface = SDL_GetVideoSurface();
+	if (surface == NULL) {
+		sdl_error(ERR_SDL_WINDOW_CREATE);
+	}
+	width = surface->w;
+	height = surface->h;
 #else
 	bool integerScalingEnabled = getIniBool("Graphics", "Integer Scaling", false);
 	bool upscale = getIniBool("Graphics", "Upscale", true);

android-project/app/src/main/java/org/diasurgical/devilutionx/DevilutionXSDLActivity.java

@@ -10,6 +10,7 @@
 import android.view.SurfaceView;
 import android.view.ViewTreeObserver;
 import android.widget.Toast;
+import android.view.WindowManager;
 
 import org.libsdl.app.SDLActivity;
 
@@ -30,6 +31,10 @@ protected void onCreate(Bundle savedInstanceState) {
 		if (Build.VERSION.SDK_INT >= 25)
 			trackVisibleSpace();
 
+		// Force app to overlap with the display cutout
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
+			getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+
 		externalDir = chooseExternalFilesDir();
 
 		migrateSaveGames();