From fd53f180896764f1ee0633c786639631935b5a9c Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Thu, 14 Mar 2024 12:42:37 -0400
Subject: [PATCH] v2.4.0: fixed various specific bugs caused by launching in
 fullscreen

---
 .../shatteredpixeldungeon/desktop/DesktopLauncher.java     | 7 +++----
 .../desktop/DesktopPlatformSupport.java                    | 6 ++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java b/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java
index 351384c1b..486d824e4 100644
--- a/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java
+++ b/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java
@@ -173,10 +173,9 @@ public class DesktopLauncher {
 
 		config.setMaximized(SPDSettings.windowMaximized());
 
-		//going fullscreen on launch is still buggy on macOS, so game enters it slightly later
-		if (SPDSettings.fullscreen() && !SharedLibraryLoader.isMac) {
-			config.setFullscreenMode(Lwjgl3ApplicationConfiguration.getDisplayMode());
-		}
+		//going fullscreen on launch is a bit buggy
+		// so game always starts windowed and then switches in DesktopPlatformSupport.updateSystemUI
+		//config.setFullscreenMode(Lwjgl3ApplicationConfiguration.getDisplayMode());
 		
 		//records whether window is maximized or not for settings
 		DesktopWindowListener listener = new DesktopWindowListener();
diff --git a/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java b/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java
index fe69bc51b..5a60fdd51 100644
--- a/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java
+++ b/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java
@@ -45,16 +45,14 @@ public class DesktopPlatformSupport extends PlatformSupport {
 	public void updateDisplaySize() {
 		if (previousSizes == null){
 			previousSizes = new Point[2];
-			previousSizes[0] = previousSizes[1] = new Point(Game.width, Game.height);
+			previousSizes[1] = SPDSettings.windowResolution();
 		} else {
 			previousSizes[1] = previousSizes[0];
-			previousSizes[0] = new Point(Game.width, Game.height);
 		}
+		previousSizes[0] = new Point(Game.width, Game.height);
 		if (!SPDSettings.fullscreen()) {
 			SPDSettings.windowResolution( previousSizes[0] );
 		}
-		//TODO fixes an in libGDX v1.11.0 with macOS displays
-		Gdx.gl.glViewport(0, 0, Gdx.graphics.getBackBufferWidth(), Gdx.graphics.getBackBufferHeight());
 	}
 	
 	@Override