From a4629c3ea8e53a2ac4dc1b548ba6dd62b6052888 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Wed, 19 Jun 2024 12:26:34 +0900
Subject: [PATCH] new fullscreen method

---
 .idea/misc.xml                    |  2 +-
 src/net/torvald/terrarum/App.java | 31 +++++++++++++++++++------------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index a1395dd85..8af1662a9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -38,7 +38,7 @@
       <property name="caretWidth" class="java.lang.Integer" />
     </properties>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SuppressKotlinCodeStyleNotification">
diff --git a/src/net/torvald/terrarum/App.java b/src/net/torvald/terrarum/App.java
index 11055e4f8..9dcccdefa 100644
--- a/src/net/torvald/terrarum/App.java
+++ b/src/net/torvald/terrarum/App.java
@@ -49,6 +49,8 @@ import net.torvald.unsafe.UnsafeHelper;
 import net.torvald.util.DebugTimers;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
+import org.lwjgl.PointerBuffer;
+import org.lwjgl.glfw.GLFW;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -439,18 +441,7 @@ public class App implements ApplicationListener {
             appConfig.useVsync(getConfigBoolean("usevsync"));
             appConfig.setResizable(false);
 
-            if (useFullscreen) {
-                // auto resize for fullscreen
-                var disp = Lwjgl3ApplicationConfiguration.getDisplayMode(Lwjgl3ApplicationConfiguration.getPrimaryMonitor());
-                var newWidth = ((int)(disp.width / magn)) & 0x7FFFFFFE;
-                var newHeight = ((int)(disp.height / magn)) & 0x7FFFFFFE;
-                scr.setDimension(newWidth, newHeight, magn);
-
-                appConfig.setFullscreenMode(disp);
-
-            }
-            else
-                appConfig.setWindowedMode(width, height);
+            appConfig.setWindowedMode(width, height);
 
             // if filter is none AND magn is not (100% or 200%), set filter to hq2x
             if (getConfigString("screenmagnifyingfilter").equals("none") && magn != 1f && magn != 2f) {
@@ -500,6 +491,22 @@ public class App implements ApplicationListener {
 
     @Override
     public void create() {
+        boolean useFullscreen = getConfigBoolean("fullscreen");
+        float magn = (float) getConfigDouble("screenmagnifying");
+
+        if (useFullscreen) {
+            // auto resize for fullscreen
+            var disp = Gdx.graphics.getDisplayMode();
+//            var disp = Lwjgl3ApplicationConfiguration.getDisplayMode(Lwjgl3ApplicationConfiguration.getPrimaryMonitor()); // won't work on macOS (reports 1920x1200 no matter what)
+            var newWidth = ((int)(disp.width / magn)) & 0x7FFFFFFE;
+            var newHeight = ((int)(disp.height / magn)) & 0x7FFFFFFE;
+            scr.setDimension(newWidth, newHeight, magn);
+
+            Gdx.graphics.setFullscreenMode(disp);
+        }
+
+
+
         File loadOrderFile = new File(App.loadOrderDir);
         if (loadOrderFile.exists()) {
             // load modules