From c92be334aecef9f5ac969775310cadb106fbd8a5 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sat, 8 Feb 2014 18:51:55 +0000
Subject: [PATCH] Maximize space for viewing pack cards by eliminating Choose
 Card button and hiding view options by default

---
 .../controllers/CEditorDraftingProcess.java           |  7 +++++--
 .../forge/gui/toolbox/itemmanager/ItemManager.java    | 11 ++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java
index a2c7b12cc90..9e8b4f5fc88 100644
--- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java
+++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java
@@ -69,7 +69,10 @@ public class CEditorDraftingProcess extends ACEditorBase<PaperCard, DeckGroup> {
         final CardManager catalogManager = new CardManager(false);
         final CardManager deckManager = new CardManager(false);
 
-        catalogManager.setHideFilters(true); //hide filters so more of pack is visible by default
+        //hide filters and options panel so more of pack is visible by default
+        catalogManager.setHideFilters(true);
+        catalogManager.setHideViewOptions(1, true);
+
         deckManager.setCaption("Draft Picks");
 
         catalogManager.setAlwaysNonUnique(true);
@@ -264,7 +267,6 @@ public class CEditorDraftingProcess extends ACEditorBase<PaperCard, DeckGroup> {
         this.getDeckManager().setup(SColumnUtil.getDeckDefaultColumns(), GroupDef.CREATURE_SPELL_LAND, ColumnDef.CMC, 1);
 
         ccAddLabel = this.getBtnAdd().getText();
-        this.getBtnAdd().setText("Choose Card");
 
         if (this.getDeckManager().getPool() == null) { //avoid showing next choice or resetting pool if just switching back to Draft screen
             this.showChoices(this.boosterDraft.nextChoice());
@@ -275,6 +277,7 @@ public class CEditorDraftingProcess extends ACEditorBase<PaperCard, DeckGroup> {
         }
 
         //Remove buttons
+        this.getBtnAdd().setVisible(false);
         this.getBtnAdd4().setVisible(false);
         this.getBtnRemove().setVisible(false);
         this.getBtnRemove4().setVisible(false);
diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java
index 3a5dd1a46b2..97dca0a4a89 100644
--- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java
+++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java
@@ -321,9 +321,9 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel {
         this.setViewIndex(viewIndex);
     }
 
-    public void setViewIndex(int index) {
-        if (index < 0 || index >= this.views.size()) { return; }
-        ItemView<T> view = this.views.get(index);
+    public void setViewIndex(int viewIndex) {
+        if (viewIndex < 0 || viewIndex >= this.views.size()) { return; }
+        ItemView<T> view = this.views.get(viewIndex);
         if (this.currentView == view) { return; }
 
         final int backupIndexToSelect = this.currentView.getSelectedIndex();
@@ -352,6 +352,11 @@ public abstract class ItemManager<T extends InventoryItem> extends JPanel {
         this.focus();
     }
 
+    public void setHideViewOptions(int viewIndex, boolean hideViewOptions) {
+        if (viewIndex < 0 || viewIndex >= this.views.size()) { return; }
+        this.views.get(viewIndex).getPnlOptions().setVisible(!hideViewOptions);
+    }
+
     @Override
     public void doLayout() {
         int buttonPanelHeight = 32;