diff --git a/forge-gui-mobile-dev/src/forge/app/Main.java b/forge-gui-mobile-dev/src/forge/app/Main.java index 089e4a11fe5..9114b241f95 100644 --- a/forge-gui-mobile-dev/src/forge/app/Main.java +++ b/forge-gui-mobile-dev/src/forge/app/Main.java @@ -4,9 +4,10 @@ import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglClipboard; import forge.Forge; +import forge.util.Utils; public class Main { public static void main(String[] args) { - new LwjglApplication(new Forge(new LwjglClipboard(), "../forge-gui/"), "Forge", 320, 480, true); + new LwjglApplication(new Forge(new LwjglClipboard(), "../forge-gui/"), "Forge", (int)Utils.BASE_WIDTH, (int)Utils.BASE_HEIGHT, true); } } diff --git a/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java b/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java index b4a6993eaab..607b77c4740 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java @@ -245,14 +245,13 @@ public class VPlayerPanel extends FContainer { @Override public void draw(Graphics g) { float x, y, w, h; - boolean flipped = isFlipped(); if (selectedTab == this) { y = 0; w = getWidth(); h = getHeight(); float yAcross; - if (flipped) { + if (isFlipped()) { y += INFO_TAB_PADDING_Y; yAcross = y; y--; @@ -295,24 +294,11 @@ public class VPlayerPanel extends FContainer { } h = icon.getHeight() * w / icon.getWidth(); x = (getWidth() - w) / 2; - if (flipped) { - y = getHeight() - h - INFO_TAB_PADDING_Y; - } - else { - y = INFO_TAB_PADDING_Y; - } + y = INFO_TAB_PADDING_Y; g.drawImage(icon, x, y, w, h); - if (flipped) { - h = INFO_FONT.getFont().getCapHeight(); - y -= h + INFO_TAB_PADDING_Y; - h += INFO_TAB_PADDING_Y; - } - else { - y += h + INFO_TAB_PADDING_Y; - h = getHeight() - y + 1; - } - g.drawText(value, INFO_FONT, INFO_FORE_COLOR, 0, y, getWidth(), h, false, HAlignment.CENTER, false); + y += h + INFO_TAB_PADDING_Y; + g.drawText(value, INFO_FONT, INFO_FORE_COLOR, 0, y, getWidth(), getHeight() - y + 1, false, HAlignment.CENTER, false); } } }