From e646ff1d1fc81b6148e33d60f68bec05cb8afe90 Mon Sep 17 00:00:00 2001 From: drdev Date: Tue, 26 Nov 2013 01:55:46 +0000 Subject: [PATCH] Add checkbox to control whether list view or card view for Stack --- .../java/forge/gui/home/settings/CSubmenuPreferences.java | 1 + .../java/forge/gui/home/settings/VSubmenuPreferences.java | 8 ++++++++ forge-gui/src/main/java/forge/gui/match/views/VStack.java | 1 - 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java b/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java index 91305e13c08..99ee0ab5e2e 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java @@ -82,6 +82,7 @@ public enum CSubmenuPreferences implements ICDoc { lstControls.add(Pair.of(view.getCbCompactMainMenu(), FPref.UI_COMPACT_MAIN_MENU)); lstControls.add(Pair.of(view.getCbUseThemes(), FPref.UI_THEMED_COMBOBOX)); lstControls.add(Pair.of(view.getCbPromptFreeBlocks(), FPref.MATCHPREF_PROMPT_FREE_BLOCKS)); + lstControls.add(Pair.of(view.getCbStackCardView(), FPref.UI_STACK_CARD_VIEW)); lstControls.add(Pair.of(view.getCbHideReminderText(), FPref.UI_HIDE_REMINDER_TEXT)); for(final Pair kv : lstControls) { diff --git a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java index 3e54aacc045..bef99f4fb71 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java @@ -84,6 +84,7 @@ public enum VSubmenuPreferences implements IVSubmenu { private final JCheckBox cbCompactMainMenu = new OptionsCheckBox("Use Compact Main Sidebar Menu"); private final JCheckBox cbUseThemes = new OptionsCheckBox("Enable Themes"); private final JCheckBox cbPromptFreeBlocks = new OptionsCheckBox("Free Block Handling"); + private final JCheckBox cbStackCardView = new OptionsCheckBox("Card View for Stack"); private final JCheckBox cbHideReminderText = new OptionsCheckBox("Hide Reminder Text"); private final Map shortcutFields = new HashMap(); @@ -195,6 +196,9 @@ public enum VSubmenuPreferences implements IVSubmenu { pnlPrefs.add(cbUiForTouchScreen, regularConstraints); pnlPrefs.add(new NoteLabel("Increases some UI elements to provide a better experience on touchscreen devices. (Needs restart)"), regularConstraints); + pnlPrefs.add(cbStackCardView, regularConstraints); + pnlPrefs.add(new NoteLabel("Show cards and abilities on Stack in card view rather than list view."), regularConstraints); + pnlPrefs.add(cbHideReminderText, regularConstraints); pnlPrefs.add(new NoteLabel("Hide reminder text in Card Detail pane."), regularConstraints); @@ -488,6 +492,10 @@ public enum VSubmenuPreferences implements IVSubmenu { return cbUiForTouchScreen; } + public final JCheckBox getCbStackCardView() { + return cbStackCardView; + } + public final JCheckBox getCbHideReminderText() { return cbHideReminderText; } diff --git a/forge-gui/src/main/java/forge/gui/match/views/VStack.java b/forge-gui/src/main/java/forge/gui/match/views/VStack.java index f952ea4f3da..578c93d95c1 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VStack.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VStack.java @@ -363,7 +363,6 @@ public enum VStack implements IVDoc { public StackArea(final JScrollPane scrollPane) { super(scrollPane); - setCardWidthMax(200); } /** {@inheritDoc} */