From 2ed45c2d915a103070d938a5348526066e8a361f Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Mon, 7 Feb 2022 10:37:08 +0800 Subject: [PATCH] cleanup - todo figure out android... --- .../src/main/java/forge/adventure/Main.java | 12 ++---------- forge-gui-mobile/src/forge/Forge.java | 6 ++++-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/forge-adventure/src/main/java/forge/adventure/Main.java b/forge-adventure/src/main/java/forge/adventure/Main.java index 2c9ccdef29c..b30fcc15653 100644 --- a/forge-adventure/src/main/java/forge/adventure/Main.java +++ b/forge-adventure/src/main/java/forge/adventure/Main.java @@ -35,16 +35,8 @@ public class Main { Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration(); config.setResizable(false); - try { - //todo figuure out fullscreen mode... - if (Config.instance().getSettingData().fullScreen) { - config.setFullscreenMode(Lwjgl3ApplicationConfiguration.getDisplayMode()); - } else { - config.setWindowedMode(Config.instance().getSettingData().width, Config.instance().getSettingData().height); - } - } catch (Exception e) {} - - config.setWindowIcon(Config.instance().getFilePath("forge-adventure.png")); + //todo icon config && fullscreen mode + config.setWindowedMode(1280, 720); new Lwjgl3Application(Forge.getApp(new Lwjgl3Clipboard(), new DesktopAdapter(""), Files.exists(Paths.get("./res"))?"./":"../forge-gui/", true, false, 0, true, 0, "", "", true), config); diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index acca09d6e9a..dc1e2608d18 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -278,8 +278,10 @@ public class Forge implements ApplicationListener { } public static void openAdventure() { startContinuousRendering(); - final LoadingOverlay loader = new LoadingOverlay("Loading Adventure"); - loader.show(); + if (!isDesktopAdventureMode) { + final LoadingOverlay loader = new LoadingOverlay("Loading Adventure"); + loader.show(); + } GuiBase.setIsAdventureMode(true); FThreads.invokeInBackgroundThread(new Runnable() { @Override