diff --git a/res/lang/en.properties b/res/lang/en.properties index 88cac807cba..fd57b252c27 100644 --- a/res/lang/en.properties +++ b/res/lang/en.properties @@ -146,7 +146,7 @@ NewGame/menu/downloadlq=Download Card LQ Pictures NewGame/menu/downloadsetlq=Download Card Set LQ Pictures NewGame/menu/importPicture=Import Pictures NewGame/menu/downloadPrice=Update Price -NewGame/menu/cardSizes=Specify Card Size +NewGame/menu/cardSizes=Specify Max Card Size NewGame/menu/cardStack=Specify Max Stack Size NewGame/menu/cardStackOffset=Specify Stack Offset NewGame/menu/about=About diff --git a/src/main/java/arcane/ui/CardPanelContainer.java b/src/main/java/arcane/ui/CardPanelContainer.java index 1627e00cc60..995752a2543 100644 --- a/src/main/java/arcane/ui/CardPanelContainer.java +++ b/src/main/java/arcane/ui/CardPanelContainer.java @@ -3,6 +3,7 @@ package arcane.ui; import arcane.ui.util.CardPanelMouseListener; import arcane.ui.util.UI; import forge.Card; +import forge.Constant; import javax.swing.*; import java.awt.*; @@ -27,7 +28,7 @@ abstract public class CardPanelContainer extends JPanel { public List cardPanels = new ArrayList(); protected JScrollPane scrollPane; - protected int cardWidthMin = 50, cardWidthMax = 300; + protected int cardWidthMin = 50, cardWidthMax = Constant.Runtime.width[0]; protected CardPanel mouseOverPanel, mouseDownPanel, mouseDragPanel; private List listeners = new ArrayList(2); diff --git a/src/main/java/forge/Constant.java b/src/main/java/forge/Constant.java index 52d53360882..4c03f7cc8a8 100644 --- a/src/main/java/forge/Constant.java +++ b/src/main/java/forge/Constant.java @@ -33,7 +33,7 @@ public interface Constant { public static final boolean[] RndCFoil = new boolean[1]; - public static final int[] width = new int[1]; + public static final int[] width = {300}; public static final int[] height = new int[1]; public static final int[] stackSize = new int[1]; diff --git a/src/main/java/forge/view/swing/Gui_HomeScreen.java b/src/main/java/forge/view/swing/Gui_HomeScreen.java index 576cfa596d2..fcb3b0f5390 100644 --- a/src/main/java/forge/view/swing/Gui_HomeScreen.java +++ b/src/main/java/forge/view/swing/Gui_HomeScreen.java @@ -1521,11 +1521,11 @@ public class Gui_HomeScreen { } private void doCardSize() { - String[] keys = {"Tiny", "Smaller", "Small", "Medium", "Large", "Huge"}; - int[] widths = {36, 42, 63, 70, 93, 120}; + String[] keys = {"Tiny", "Smaller", "Small", "Medium", "Large(default)", "Huge"}; + int[] widths = {52, 80, 120, 200, 300, 400}; int[] heights = {50, 59, 88, 98, 130, 168}; - ListChooser ch = new ListChooser("Choose one", "Choose a new card size", 0, 1, keys); + ListChooser ch = new ListChooser("Choose one", "Choose a new max card size", 0, 1, keys); if (ch.show()) { try { int index = ch.getSelectedIndex(); diff --git a/src/main/java/forge/view/swing/OldGuiNewGame.java b/src/main/java/forge/view/swing/OldGuiNewGame.java index f7e1796fd31..a35215ce7a3 100644 --- a/src/main/java/forge/view/swing/OldGuiNewGame.java +++ b/src/main/java/forge/view/swing/OldGuiNewGame.java @@ -134,7 +134,7 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants. AllZone.setQuestData(null); if (Constant.Runtime.width[0] == 0) { - Constant.Runtime.width[0] = 70; + Constant.Runtime.width[0] = 300; } if (Constant.Runtime.height[0] == 0) { @@ -1151,7 +1151,7 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants. private static final long serialVersionUID = -2900235618450319571L; private static String[] keys = {"Tiny", "Smaller", "Small", "Medium", "Large", "Huge"}; - private static int[] widths = {36, 42, 63, 70, 93, 120}; + private static int[] widths = {52, 80, 120, 200, 300, 400}; private static int[] heights = {50, 59, 88, 98, 130, 168}; /** @@ -1165,7 +1165,7 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants. * */ public final void actionPerformed(final ActionEvent e) { - ListChooser ch = new ListChooser("Choose one", "Choose a new card size", 0, 1, keys); + ListChooser ch = new ListChooser("Choose one", "Choose a new max card size", 0, 1, keys); if (ch.show()) { try { int index = ch.getSelectedIndex();