Changed auto full screen logic to use OS first and then fall back on …

…touch screen.
lanceewing · Apr 4, 2024 · f91174d · f91174d
1 parent a5c8e04
commit f91174d
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/core/src/main/java/com/agifans/agile/AgileRunner.java b/core/src/main/java/com/agifans/agile/AgileRunner.java
@@ -183,4 +183,6 @@ private void updateGameClock() {
     public abstract void saveScreenshot(Agile agile, AppConfigItem appConfigItem, Pixmap pixmap);
 
     public abstract boolean hasTouchScreen();
+
+    public abstract boolean isMobile();
 }
diff --git a/core/src/main/java/com/agifans/agile/GameScreen.java b/core/src/main/java/com/agifans/agile/GameScreen.java
@@ -189,7 +189,7 @@ public void show() {
             Gdx.input.setInputProcessor(landscapeInputProcessor);
         }
 
-        if (agileRunner.hasTouchScreen()) {
+        if (agileRunner.isMobile()) {
             gameScreenInputProcessor.setJoystickAlignment(JoystickAlignment.RIGHT);
 
             if (!Gdx.graphics.isFullscreen() && startedByUser) {
@@ -220,7 +220,7 @@ public void render(float delta) {
             // This makes sure we update the Pixmap one last time before leaving, as that
             // will mean that the AGI game screen starts out black for the next game.
             copyPixels();
-            if (agileRunner.hasTouchScreen() && Gdx.graphics.isFullscreen()) {
+            if (agileRunner.isMobile() && Gdx.graphics.isFullscreen()) {
                 gameScreenInputProcessor.switchOutOfFullScreen();
             }
             agile.setScreen(agile.getHomeScreen());

diff --git a/html/src/main/java/com/agifans/agile/gwt/GwtAgileRunner.java b/html/src/main/java/com/agifans/agile/gwt/GwtAgileRunner.java
@@ -305,4 +305,30 @@ private native boolean hasTouchScreenHtml() /*-{
             return false;
         }
     }-*/;
+
+    @Override
+    public boolean isMobile() {
+        return isMobileHtml();
+    }
+
+    private native boolean isMobileHtml() /*-{
+        if (navigator.userAgentData) {
+            return navigator.userAgentData.mobile;
+        } else {
+            // Fall back to user-agent parsing, as some browsers don't support above yet.
+            if (navigator.platform.indexOf("Win") != -1) return false;
+            if (navigator.platform.indexOf("Mac") != -1) return false;
+            if (navigator.platform.indexOf("Android") != -1) return true;
+            if (navigator.platform.indexOf("iPhone") != -1) return true;
+            if (navigator.platform.indexOf("iPad") != -1) return true;
+            // For other devices, we'll use touch screen logic.
+            if ("maxTouchPoints" in navigator) {
+                return navigator.maxTouchPoints > 0;
+            } else if ("msMaxTouchPoints" in navigator) {
+                return navigator.msMaxTouchPoints > 0;
+            } else {
+                return false;
+            }
+        }
+    }-*/;
 }
diff --git a/lwjgl3/src/main/java/com/agifans/agile/lwjgl3/DesktopAgileRunner.java b/lwjgl3/src/main/java/com/agifans/agile/lwjgl3/DesktopAgileRunner.java
@@ -138,4 +138,10 @@ public boolean hasTouchScreen() {
         // We don't check this for Desktop.
         return false;
     }
+
+    @Override
+    public boolean isMobile() {
+        // Desktop/Java/LWJGL platform is obviously not mobile.
+        return false;
+    }
 }