Restore default screen orientation autodetection (Card-Forge#9676)

krafczyk · web-flow · commit 164d6e72ef8e · 2026-03-04T17:18:56.000Z
Co-authored-by: tool4EvEr &lt;tool4EvEr@&gt;
diff --git a/forge-gui-android/src/forge/app/Main.java b/forge-gui-android/src/forge/app/Main.java
@@ -348,13 +348,12 @@ private void displayMessage(View previousView, AndroidAdapter adapter, boolean e
     }
 
     private void loadGame(final HWInfo hwInfo, final String title, final String steps, boolean isLandscape, AndroidAdapter adapter, boolean permissiongranted, boolean isTabletDevice, AndroidApplicationConfiguration config, boolean exception, String msg) {
-        int totalRAM = hwInfo.getTotalRam();
         try {
             final Handler handler = new Handler();
             forgeLogo = findViewById(resId("id", "logo_id"));
             activeView = findViewById(resId("id", "mainview"));
             activeView.setBackgroundColor(Color.WHITE);
-            forgeView = initializeForView(Forge.getApp(hwInfo, getAndroidClipboard(), adapter, ASSETS_DIR, false, !isLandscape, totalRAM, isTabletDevice, Build.VERSION.SDK_INT), config);
+            forgeView = initializeForView(Forge.getApp(hwInfo, getAndroidClipboard(), adapter, ASSETS_DIR, false, !isLandscape, isTabletDevice, Build.VERSION.SDK_INT), config);
 
             getAnimator(ObjectAnimator.ofFloat(forgeLogo, "alpha", 1f, 1f).setDuration(800), ObjectAnimator.ofObject(activeView, "backgroundColor", new ArgbEvaluator(), Color.WHITE, Color.BLACK).setDuration(1600), new AnimatorListenerAdapter() {
                 @Override
diff --git a/forge-gui-ios/src/forge/ios/Main.java b/forge-gui-ios/src/forge/ios/Main.java
@@ -30,7 +30,7 @@ protected IOSApplication createApplication() {
         final IOSApplicationConfiguration config = new IOSApplicationConfiguration();
         config.useAccelerometer = false;
         config.useCompass = false;
-        final ApplicationListener app = Forge.getApp(null, new IOSClipboard(), new IOSAdapter(), assetsDir, false, false, 0, false, 0);
+        final ApplicationListener app = Forge.getApp(null, new IOSClipboard(), new IOSAdapter(), assetsDir, false, false, false, 0);
         final IOSApplication iosApp = new IOSApplication(app, config);
         return iosApp;
     }
diff --git a/forge-gui-mobile-dev/src/forge/app/GameLauncher.java b/forge-gui-mobile-dev/src/forge/app/GameLauncher.java
@@ -1,6 +1,7 @@
 package forge.app;
 
 import com.badlogic.gdx.ApplicationListener;
+import com.badlogic.gdx.Graphics.DisplayMode;
 import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
 import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
 import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Clipboard;
@@ -33,7 +34,6 @@ public GameLauncher(final String versionString, final String[] args) {
         Configuration.STACK_SIZE.set(1024);
         Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration();
         HWInfo hw = null;
-        int totalRAM = 0;
         try {
             SystemInfo si = new SystemInfo();
             // Device Info
@@ -51,56 +51,64 @@ public GameLauncher(final String versionString, final String[] args) {
             os.setVersion(si.getOperatingSystem().getVersionInfo().getVersion());
             os.setBuild(si.getOperatingSystem().getVersionInfo().getBuildNumber());
             os.setRawDescription(si.getOperatingSystem() + " x" + si.getOperatingSystem().getBitness());
-            totalRAM = Math.round(si.getHardware().getMemory().getTotal() / 1024f / 1024f);
             hw = new HWInfo(device, os, false);
         } catch (Exception e) {
              e.printStackTrace();
         }
 
         // Retrieve command line parameters
-        int windowHeight = 0;
-        int windowWidth = 0;
-        boolean isPortrait = false;
-        boolean manualWindowSize = false;
+        Integer widthArg = null;
+        Integer heightArg = null;
+        boolean portraitArg = false;
+        boolean landscapeArg = false;
         for(String arg : args) {
-            if(arg.startsWith("width=")) {
-                windowWidth = Integer.parseInt(arg.substring(6));
-                manualWindowSize = true;
-            }
-            if(arg.startsWith("height=")) {
-                windowHeight = Integer.parseInt(arg.substring(7));
-                manualWindowSize = true;
-            }
-            if(arg.equalsIgnoreCase("portrait")) {
-                isPortrait = true;
-            }
+            if(arg.startsWith("width=")) widthArg = Integer.parseInt(arg.substring(6));
+            else if(arg.startsWith("height=")) heightArg = Integer.parseInt(arg.substring(7));
+            else if(arg.equalsIgnoreCase("portrait")) portraitArg = true;
+            else if(arg.equalsIgnoreCase("landscape")) landscapeArg = true;
         }
 
-        // Check if the manually supplied window size indicates portrait mode
-        if ((windowHeight > 0) && (windowWidth > 0)) {
-            if (windowHeight > windowWidth) {
-                isPortrait = true;
-            }
-        }
+        boolean hasBothDims = widthArg != null && heightArg != null;
+        // Only disable desktop auto-orientation when the user *really* overrides it
+        boolean overrideOrientation = portraitArg || landscapeArg || hasBothDims;
+        Forge.setDesktopAutoOrientation(!overrideOrientation);
+
+        // Determine desired portrait/landscape only if we are overriding orientation.
+        boolean isPortrait = false;
+        if (portraitArg) isPortrait = true;
+        else if (landscapeArg) isPortrait = false;
+        else if (hasBothDims) isPortrait = heightArg > widthArg;
 
         ApplicationListener start = Forge.getApp(hw, new Lwjgl3Clipboard(), new Main.DesktopAdapter(switchOrientationFile),
-            assetsDir, false, isPortrait, totalRAM, false, 0);
+            assetsDir, false, isPortrait, false, 0);
+
+        // Initialize window size
+        int windowWidth, windowHeight;
 
-        // If no manual window size is supplied, use the configured one (and adjust for portrait mode if needed)
-        if (!manualWindowSize) {
+        if (widthArg != null || heightArg != null) {
+            float aspect = getPrimaryScreenAspect();
+
+            // If explicit portrait/landscape requested, coerce aspect direction
+            if (portraitArg && aspect > 1f) aspect = 1f / aspect;
+            if (landscapeArg && aspect < 1f) aspect = 1f / aspect;
+
+            if (widthArg != null && heightArg == null) {
+                windowWidth = widthArg;
+                windowHeight = Math.max(1, Math.round(windowWidth / aspect));
+            } else if (heightArg != null && widthArg == null) {
+                windowHeight = heightArg;
+                windowWidth = Math.max(1, Math.round(windowHeight * aspect));
+            } else { // both provided
+                windowWidth = widthArg;
+                windowHeight = heightArg;
+            }
+        } else {
             windowWidth = Config.instance().getSettingData().width;
             windowHeight = Config.instance().getSettingData().height;
-            if (isPortrait && (windowHeight < windowWidth)) {
-                // swap width/height
-                int tmp = windowHeight;
-                windowHeight = windowWidth;
-                windowWidth = tmp;
-            } else if (!isPortrait && (windowWidth < windowHeight)) {
-                // swap width/height
-                int tmp = windowHeight;
-                windowHeight = windowWidth;
-                windowWidth = tmp;
-            }
+        }
+        // If user explicitly overrode orientation, normalize by swapping
+        if (overrideOrientation && isPortrait == windowHeight < windowWidth) {
+            int tmp = windowHeight; windowHeight = windowWidth; windowWidth = tmp;
         }
 
         if (Config.instance().getSettingData().fullScreen) {
@@ -138,4 +146,10 @@ public void focusLost() {
 
         new Lwjgl3Application(start, config);
     }
+
+    private static float getPrimaryScreenAspect() {
+        DisplayMode dm = Lwjgl3ApplicationConfiguration.getDisplayMode();
+        if (dm == null || dm.height == 0) return 16f / 9f; // sane fallback
+        return (float) dm.width / (float) dm.height; // width/height
+    }
 }
diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
@@ -128,8 +128,9 @@ public class Forge implements ApplicationListener {
     public static boolean forcedEnglishonCJKMissing = false;
     public static boolean createNewAdventureMap = false;
     private static Localizer localizer;
+    private static boolean desktopAutoOrientation = true;
 
-    public static ApplicationListener getApp(HWInfo hwInfo, Clipboard clipboard0, IDeviceAdapter deviceAdapter0, String assetDir0, boolean propertyConfig, boolean androidOrientation, int totalRAM, boolean isTablet, int AndroidAPI) {
+    public static ApplicationListener getApp(HWInfo hwInfo, Clipboard clipboard0, IDeviceAdapter deviceAdapter0, String assetDir0, boolean propertyConfig, boolean androidOrientation, boolean isTablet, int AndroidAPI) {
         if (app == null) {
             app = new Forge();
             if (GuiBase.getInterface() == null) {
@@ -140,11 +141,11 @@ public static ApplicationListener getApp(HWInfo hwInfo, Clipboard clipboard0, ID
                 GuiBase.setInterface(new GuiMobile(assetDir0));
                 GuiBase.enablePropertyConfig(propertyConfig);
                 isPortraitMode = androidOrientation;
-                totalDeviceRAM = totalRAM;
                 isTabletDevice = isTablet;
                 androidVersion = AndroidAPI;
             }
             if (hwInfo != null) {
+                totalDeviceRAM = hwInfo.getTotalRam();
                 Sentry.configureScope(ScopeType.GLOBAL, scope -> {
                     scope.getContexts().setDevice(hwInfo.device());
                     scope.getContexts().setOperatingSystem(hwInfo.os());
@@ -187,9 +188,6 @@ public void create() {
         frameRate = new FrameRate();
         animationBatch = new SpriteBatch();
         inputProcessor = new MainInputProcessor();
-        //screenWidth and screenHeight should be set initially and only change upon restarting the app
-        screenWidth = Gdx.app.getGraphics().getWidth();
-        screenHeight = Gdx.app.getGraphics().getHeight();
 
         Gdx.input.setInputProcessor(inputProcessor);
         /*
@@ -202,12 +200,20 @@ the app again (seems it doesnt dispose correctly...?!?)
         destroyThis = true; //Prevent back()
         if (Files.exists(Paths.get(ForgeConstants.DEFAULT_SKINS_DIR+ForgeConstants.ADV_TEXTURE_BG_FILE)))
             selector = getForgePreferences().getPref(FPref.UI_SELECTOR_MODE);
-        boolean landscapeMode = !isPortraitMode;
+
+        //screenWidth and screenHeight should be set initially and only change upon restarting the app
+        screenWidth = Gdx.app.getGraphics().getWidth();
+        screenHeight = Gdx.app.getGraphics().getHeight();
+        // Desktop default: auto-detect from initial window/backbuffer aspect ratio
+        if (!GuiBase.isAndroid() && desktopAutoOrientation) {
+            isPortraitMode = screenHeight > screenWidth;
+        }
         //update landscape mode preference if it doesn't match what the app loaded as
-        if (getForgePreferences().getPrefBoolean(FPref.UI_LANDSCAPE_MODE) != landscapeMode) {
-            getForgePreferences().setPref(FPref.UI_LANDSCAPE_MODE, landscapeMode);
+        if (getForgePreferences().getPrefBoolean(FPref.UI_LANDSCAPE_MODE) != isLandscapeMode()) {
+            getForgePreferences().setPref(FPref.UI_LANDSCAPE_MODE, isLandscapeMode());
             getForgePreferences().save();
         }
+
         String skinName;
         if (FileUtil.doesFileExist(ForgeConstants.MAIN_PREFS_FILE)) {
             skinName = getForgePreferences().getPref(FPref.UI_SKIN);
@@ -1653,4 +1659,8 @@ private void translateButtons(Controller controller, int buttonIndex, boolean ke
         if (Controllers.getCurrent() != null)
             System.out.println("Gamepad: " + Controllers.getCurrent().getName());
     }
+
+    public static void setDesktopAutoOrientation(boolean auto) {
+        desktopAutoOrientation = auto;
+    }
 }
diff --git a/forge-gui-mobile/src/forge/adventure/util/Config.java b/forge-gui-mobile/src/forge/adventure/util/Config.java
@@ -56,7 +56,6 @@ static public Config instance() {
     }
 
     private Config() {
-
         String path = resPath();
         FilenameFilter planesFilter = (file, s) -> (!s.contains(".") && !s.equals(commonDirectoryName));
 
diff --git a/forge-gui/res/cardsfolder/b/bespoke _bo.txt b/forge-gui/res/cardsfolder/b/bespoke _bo.txt

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ protected IOSApplication createApplication() {`
`30`	`30`	`final IOSApplicationConfiguration config = new IOSApplicationConfiguration();`
`31`	`31`	`config.useAccelerometer = false;`
`32`	`32`	`config.useCompass = false;`
`33`		`- final ApplicationListener app = Forge.getApp(null, new IOSClipboard(), new IOSAdapter(), assetsDir, false, false, 0, false, 0);`
	`33`	`+ final ApplicationListener app = Forge.getApp(null, new IOSClipboard(), new IOSAdapter(), assetsDir, false, false, false, 0);`
`34`	`34`	`final IOSApplication iosApp = new IOSApplication(app, config);`
`35`	`35`	`return iosApp;`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ static public Config instance() {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`private Config() {`
`59`		`-`
`60`	`59`	`String path = resPath();`
`61`	`60`	`FilenameFilter planesFilter = (file, s) -> (!s.contains(".") && !s.equals(commonDirectoryName));`
`62`	`61`