From 4afab1c6d15dd5c263bee9de04cbbcaa4087aa30 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sat, 12 Apr 2014 04:56:48 +0000
Subject: [PATCH] Improve caption slightly more

---
 .../src/forge/deck/FDeckChooser.java          |  4 +---
 .../src/forge/itemmanager/DeckManager.java    | 24 ++++++++++---------
 .../src/forge/itemmanager/ItemManager.java    |  5 +++-
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/forge-gui-mobile/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java
index d2f13a23f17..bb99910fa3a 100644
--- a/forge-gui-mobile/src/forge/deck/FDeckChooser.java
+++ b/forge-gui-mobile/src/forge/deck/FDeckChooser.java
@@ -45,7 +45,7 @@ public class FDeckChooser extends FScreen {
     public FDeckChooser(boolean isAi0) {
         super(true, "", false);
         isAi = isAi0;
-        
+
         lstDecks.setItemActivateHandler(new FEventHandler() {
             @Override
             public void handleEvent(FEvent e) {
@@ -303,8 +303,6 @@ public class FDeckChooser extends FScreen {
         }
         if (deckType == null) { return; }
 
-        lstDecks.setCaption(deckType.toString());
-
         switch (deckType) {
         case CUSTOM_DECK:
             updateCustom();
diff --git a/forge-gui-mobile/src/forge/itemmanager/DeckManager.java b/forge-gui-mobile/src/forge/itemmanager/DeckManager.java
index 6c3fa6834ea..96b512016b3 100644
--- a/forge-gui-mobile/src/forge/itemmanager/DeckManager.java
+++ b/forge-gui-mobile/src/forge/itemmanager/DeckManager.java
@@ -40,35 +40,37 @@ public final class DeckManager extends ItemManager<DeckProxy> {
      */
     public DeckManager(final GameType gt) {
         super(DeckProxy.class, true);
-        this.gametype = gt;
+        gametype = gt;
 
-        this.setItemActivateHandler(new FEventHandler() {
+        setItemActivateHandler(new FEventHandler() {
             @Override
             public void handleEvent(FEvent e) {
                 editDeck(getSelectedItem());
             }
         });
+
+        setCaption("Decks");
     }
 
     @Override
     public void setup(ItemManagerConfig config0) {
-        boolean wasStringOnly = (this.getConfig() == ItemManagerConfig.STRING_ONLY);
+        boolean wasStringOnly = (getConfig() == ItemManagerConfig.STRING_ONLY);
         boolean isStringOnly = (config0 == ItemManagerConfig.STRING_ONLY);
 
         super.setup(config0, null);
 
         if (isStringOnly != wasStringOnly) {
-            this.restoreDefaultFilters();
+            restoreDefaultFilters();
         }
     }
 
     public void setDeleteCommand(final FEventHandler c0) {
-        this.cmdDelete = c0;
+        cmdDelete = c0;
     }
 
     @Override
     protected void addDefaultFilters() {
-        if (this.getConfig() == ItemManagerConfig.STRING_ONLY) { return; }
+        if (getConfig() == ItemManagerConfig.STRING_ONLY) { return; }
 
         addFilter(new DeckColorFilter(this));
     }
@@ -164,7 +166,7 @@ public final class DeckManager extends ItemManager<DeckProxy> {
 
         /*FScreen screen = null;
 
-        switch (this.gametype) {
+        switch (gametype) {
             case Quest:
                 screen = FScreen.DECK_EDITOR_QUEST;
                 editorCtrl = new CEditorQuest(FModel.getQuest());
@@ -208,7 +210,7 @@ public final class DeckManager extends ItemManager<DeckProxy> {
         }
 
         // consider using deck proxy's method to delete deck
-        switch(this.gametype) {
+        switch(gametype) {
             case Constructed:
             case Draft:
             case Sealed:
@@ -222,10 +224,10 @@ public final class DeckManager extends ItemManager<DeckProxy> {
                 throw new UnsupportedOperationException("Delete not implemneted for game type = " + gametype.toString());
         }
 
-        this.removeItem(deck, 1);
+        removeItem(deck, 1);
 
-        if (this.cmdDelete != null) {
-            this.cmdDelete.handleEvent(new FEvent(this, FEventType.DELETE));
+        if (cmdDelete != null) {
+            cmdDelete.handleEvent(new FEvent(this, FEventType.DELETE));
         }
         return true;
     }
diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java
index 9dfb08532a5..81dc78a51ad 100644
--- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java
+++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java
@@ -283,12 +283,15 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
         float ratioWidth = lblRatio.getAutoSizeBounds().width;
         float viewButtonWidth = fieldHeight;
         float viewButtonCount = views.size() + 1;
-        float availableCaptionWidth = helper.getParentWidth() - viewButtonWidth * viewButtonCount - ratioWidth - helper.getX() - (viewButtonCount + 2) * helper.getGapX();
+        float availableCaptionWidth = helper.getParentWidth() - viewButtonWidth * viewButtonCount - ratioWidth - helper.getX() - (viewButtonCount + 1) * helper.getGapX();
         if (captionWidth > availableCaptionWidth) { //truncate caption if not enough room for it
             captionWidth = availableCaptionWidth;
         }
+        helper.offset(0, 1); //shift caption downward
         helper.include(lblCaption, captionWidth, fieldHeight);
+        helper.offset(-helper.getGapX(), 0);
         helper.fillLine(lblRatio, fieldHeight, (viewButtonWidth + helper.getGapX()) * viewButtonCount - viewButtonCount + 1); //leave room for view buttons
+        helper.offset(0, -1);
         for (ItemView<T> view : views) {
             helper.include(view.getButton(), viewButtonWidth, fieldHeight);
             helper.offset(-1, 0);