From ac31ef1faad58a264f19dff6adc21182c3d1a0a6 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Sun, 18 Aug 2024 13:52:02 -0400
Subject: [PATCH] v2.5.0: undid fullscreen changes, borderless doesn't work in
 many cases

---
 .../desktop/DesktopLauncher.java               |  7 +++++--
 .../desktop/DesktopPlatformSupport.java        | 18 +++---------------
 2 files changed, 8 insertions(+), 17 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 e9c6c32c5..0dee850d1 100644
--- a/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java
+++ b/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java
@@ -174,8 +174,11 @@ public class DesktopLauncher {
 		config.setWindowedMode( p.x, p.y );
 
 		config.setMaximized(SPDSettings.windowMaximized());
-		config.setDecorated(!SPDSettings.fullscreen());
-		
+
+		//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();
 		config.setWindowListener( listener );
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 17e840622..e4cdf762e 100644
--- a/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java
+++ b/desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopPlatformSupport.java
@@ -22,7 +22,6 @@
 package com.shatteredpixel.shatteredpixeldungeon.desktop;
 
 import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.Graphics;
 import com.badlogic.gdx.graphics.Pixmap;
 import com.badlogic.gdx.graphics.g2d.PixmapPacker;
 import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
@@ -51,32 +50,21 @@ public class DesktopPlatformSupport extends PlatformSupport {
 			previousSizes[1] = previousSizes[0];
 		}
 		previousSizes[0] = new Point(Game.width, Game.height);
-		if (!SPDSettings.fullscreen() && !SPDSettings.windowMaximized()) {
+		if (!SPDSettings.fullscreen()) {
 			SPDSettings.windowResolution( previousSizes[0] );
 		}
 	}
-	
+
 	@Override
 	public void updateSystemUI() {
 		Gdx.app.postRunnable( new Runnable() {
 			@Override
 			public void run () {
 				if (SPDSettings.fullscreen()){
-					Gdx.graphics.setUndecorated( true );
-					Graphics.DisplayMode display = Gdx.graphics.getDisplayMode();
-					Gdx.graphics.setWindowedMode( display.width, display.height );
+					Gdx.graphics.setFullscreenMode( Gdx.graphics.getDisplayMode() );
 				} else {
 					Point p = SPDSettings.windowResolution();
-					Gdx.graphics.setUndecorated( false );
-					if (SPDSettings.windowMaximized()){
-						//if we are going from fullscreen to maximized, then don't assign window res
-						Point newP = SPDSettings.windowResolution();
-						if (newP.x == p.x && newP.y == p.y){
-							return;
-						}
-					}
 					Gdx.graphics.setWindowedMode( p.x, p.y );
-					SPDSettings.windowResolution( p );
 				}
 			}
 		} );