diff --git a/forge-gui-android/src/forge/app/Main.java b/forge-gui-android/src/forge/app/Main.java index 0771593e487..333a44f1942 100644 --- a/forge-gui-android/src/forge/app/Main.java +++ b/forge-gui-android/src/forge/app/Main.java @@ -35,6 +35,6 @@ public class Main extends AndroidApplication { return; } - initialize(new Forge(getClipboard(), assetsDir), true); + initialize(Forge.getApp(getClipboard(), assetsDir), true); } } diff --git a/forge-gui-mobile-dev/src/forge/app/Main.java b/forge-gui-mobile-dev/src/forge/app/Main.java index 9114b241f95..c202b7282c8 100644 --- a/forge-gui-mobile-dev/src/forge/app/Main.java +++ b/forge-gui-mobile-dev/src/forge/app/Main.java @@ -8,6 +8,6 @@ import forge.util.Utils; public class Main { public static void main(String[] args) { - new LwjglApplication(new Forge(new LwjglClipboard(), "../forge-gui/"), "Forge", (int)Utils.BASE_WIDTH, (int)Utils.BASE_HEIGHT, true); + new LwjglApplication(Forge.getApp(new LwjglClipboard(), "../forge-gui/"), "Forge", (int)Utils.BASE_WIDTH, (int)Utils.BASE_HEIGHT, true); } } diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index 955e0948047..4588c94fd39 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -49,6 +49,7 @@ import forge.util.Utils; public class Forge implements ApplicationListener { public static final String CURRENT_VERSION = "1.5.19.005"; + private static final ApplicationListener app = new Forge(); private static Clipboard clipboard; private static int screenWidth; private static int screenHeight; @@ -59,12 +60,15 @@ public class Forge implements ApplicationListener { private static KeyInputAdapter keyInputAdapter; private static final Stack screens = new Stack(); - public Forge(Clipboard clipboard0, String assetDir0) { - if (GuiBase.getInterface() != null) { - throw new RuntimeException("Cannot initialize Forge more than once"); + public static ApplicationListener getApp(Clipboard clipboard0, String assetDir0) { + if (GuiBase.getInterface() == null) { + clipboard = clipboard0; + GuiBase.setInterface(new GuiMobile(assetDir0)); } - clipboard = clipboard0; - GuiBase.setInterface(new GuiMobile(assetDir0)); + return app; + } + + private Forge() { } @Override diff --git a/forge-gui-mobile/src/forge/toolbox/FProgressBar.java b/forge-gui-mobile/src/forge/toolbox/FProgressBar.java index 6486db75d62..27ad8be8845 100644 --- a/forge-gui-mobile/src/forge/toolbox/FProgressBar.java +++ b/forge-gui-mobile/src/forge/toolbox/FProgressBar.java @@ -151,7 +151,7 @@ public class FProgressBar extends FDisplayObject implements IProgressBar { else { g.fillRect(BACK_COLOR, 0, 0, w, h); - float selWidth = w * (float)value / (float)maximum; + float selWidth = Math.round(w * (float)value / (float)maximum); if (selWidth > 0) { g.fillRect(SEL_BACK_COLOR, 0, 0, selWidth, h); selTextRegions.add(Pair.of(0f, selWidth));