From 836e2e4307a346e658b94e639b1d210abe61835b Mon Sep 17 00:00:00 2001 From: drdev Date: Mon, 25 May 2015 05:37:59 +0000 Subject: [PATCH] Fix layout of Add Basic Lands dialog for landscape mode --- .../src/forge/deck/AddBasicLandsDialog.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java b/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java index b294bd66b1c..8d2bc27f8aa 100644 --- a/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java +++ b/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java @@ -20,6 +20,7 @@ package forge.deck; import java.text.NumberFormat; import java.util.Map.Entry; +import forge.Forge; import forge.Graphics; import forge.StaticData; import forge.assets.FSkinFont; @@ -63,7 +64,7 @@ public class AddBasicLandsDialog extends FDialog { protected ScrollBounds layoutAndGetScrollBounds(float visibleWidth, float visibleHeight) { float padding = FOptionPane.PADDING; float x = padding; - float totalWidth = 2 * visibleWidth - ADD_BTN_SIZE; + float totalWidth = Forge.isLandscapeMode() ? visibleWidth : 2 * visibleWidth - ADD_BTN_SIZE; float panelWidth = (totalWidth - 6 * padding) / 5; pnlPlains.setBounds(x, 0, panelWidth, visibleHeight); @@ -230,7 +231,13 @@ public class AddBasicLandsDialog extends FDialog { //layout card panel scroller y += comboBoxHeight + padding; float panelExtraHeight = pnlPlains.cbLandArt.getHeight() + ADD_BTN_SIZE + 2 * LAND_PANEL_PADDING; - float panelWidth = (2 * width - ADD_BTN_SIZE - 6 * padding) / 5; + float panelWidth; + if (Forge.isLandscapeMode()) { + panelWidth = (width - 6 * padding) / 5; + } + else { + panelWidth = (2 * width - ADD_BTN_SIZE - 6 * padding) / 5; + } float panelHeight = panelWidth * FCardPanel.ASPECT_RATIO + panelExtraHeight; scroller.setBounds(0, y, width, panelHeight);