Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master

forge-gui-mobile/src/forge/Forge.java

@@ -50,6 +50,8 @@ public class Forge implements ApplicationListener {
     private static final Stack<FScreen> screens = new Stack<FScreen>();
     private static boolean textureFiltering = false;
     private static boolean destroyThis = false;
+    public static String extrawide = "default";
+    public static  float heigtModifier = 0.0f;
 
     public static ApplicationListener getApp(Clipboard clipboard0, IDeviceAdapter deviceAdapter0, String assetDir0) {
         if (GuiBase.getInterface() == null) {
@@ -134,6 +136,9 @@ public class Forge implements ApplicationListener {
             NewGameMenu.getPreferredScreen().open();
         }
 
+        //adjust height modifier
+        adjustHeightModifier(getScreenWidth(), getScreenHeight());
+
         //update landscape mode preference if it doesn't match what the app loaded as
         if (FModel.getPreferences().getPrefBoolean(FPref.UI_LANDSCAPE_MODE) != isLandscapeMode) {
             FModel.getPreferences().setPref(FPref.UI_LANDSCAPE_MODE, isLandscapeMode);
@@ -162,6 +167,29 @@ public class Forge implements ApplicationListener {
         }
     }
 
+    public static void setHeightModifier(float height) {
+        heigtModifier = height;
+    }
+
+    public static float getHeightModifier() {
+        return heigtModifier;
+    }
+
+    public static void adjustHeightModifier(float DisplayW, float DisplayH) {
+        if(isLandscapeMode())
+        {//TODO: Fullscreen support for Display without screen controls
+            float aspectratio = DisplayW / DisplayH;
+            if(aspectratio > 1.82f) {/* extra wide */
+                setHeightModifier(200.0f);
+                extrawide = "extrawide";
+            }
+            else if(aspectratio > 1.7f) {/* wide */
+                setHeightModifier(100.0f);
+                extrawide = "wide";
+            }
+        }
+    }
+
     public static void showMenu() {
         if (currentScreen == null) { return; }
         endKeyInput(); //end key input before menu shown

forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java

@@ -9,6 +9,7 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 
+import forge.Forge;
 import forge.Graphics;
 import forge.assets.FImage;
 import forge.assets.FSkinColor;
@@ -151,6 +152,7 @@ public class ConquestPlaneSelector extends FDisplayObject {
 
     @Override
     public void draw(Graphics g) {
+        float hmod = Forge.getHeightModifier();
         float w = getWidth();
         float h = getHeight();
 
@@ -164,7 +166,7 @@ public class ConquestPlaneSelector extends FDisplayObject {
         FImage monitor = FSkinImage.PLANE_MONITOR;
         float monitorLeft = FOptionPane.PADDING / 2;
         float monitorWidth = w - 2 * monitorLeft;
-        float monitorHeight = monitorWidth * monitor.getHeight() / monitor.getWidth();
+        float monitorHeight = (monitorWidth * monitor.getHeight() / monitor.getWidth()) - hmod;
         float monitorLeftOffset = monitorWidth * MONITOR_LEFT_MULTIPLIER;
         float monitorTopOffset = monitorHeight * MONITOR_TOP_MULTIPLIER;
         float monitorBottomOffset = monitorHeight * MONITOR_BOTTOM_MULTIPLIER;

forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkScreen.java

@@ -46,9 +46,9 @@ public class ConquestPlaneswalkScreen extends FScreen {
     @Override
     protected void doLayout(float startY, float width, float height) {
         planeSelector.setBounds(0, startY, width, height - startY);
-
+        float btnMod = Forge.extrawide.equals("extrawide") ? 1.5f : 2.5f;
         float buttonWidth = width * 0.6f;
-        float buttonHeight = btnPlaneswalk.getFont().getCapHeight() * 2.5f;
+        float buttonHeight = btnPlaneswalk.getFont().getCapHeight() * btnMod;
         btnPlaneswalk.setBounds((width - buttonWidth) / 2, height - buttonHeight - PADDING, buttonWidth, buttonHeight);
     }