From 13d766f7064445642b8bd197f39efd304191d68e Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Fri, 25 Jul 2014 04:21:35 +0000
Subject: [PATCH] Allow restoring previous formats/sets after opening choose
 sets screen

---
 .../itemmanager/filters/FormatFilter.java     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
index 61bcec16146..4b52b48ad96 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
@@ -33,6 +33,7 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment;
 
 public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T> {
     protected GameFormat format;
+    private String selectedFormat;
     private FComboBox<Object> cbxFormats = new FComboBox<Object>();
 
     public FormatFilter(ItemManager<? super T> itemManager0) {
@@ -45,10 +46,15 @@ public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T
         }
         cbxFormats.addItem("Choose Sets...");
         cbxFormats.setSelectedIndex(0);
+        selectedFormat = cbxFormats.getText();
 
         cbxFormats.setChangedHandler(new FEventHandler() {
+            private boolean preventHandling = false;
+
             @Override
             public void handleEvent(FEvent e) {
+                if (preventHandling) { return; }
+
                 int index = cbxFormats.getSelectedIndex();
                 if (index == -1) {
                     //Do nothing when index set to -1
@@ -58,7 +64,9 @@ public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T
                     applyChange();
                 }
                 else if (index == cbxFormats.getItemCount() - 1) {
-                    cbxFormats.setSelectedIndex(-1);
+                    preventHandling = true;
+                    cbxFormats.setText(selectedFormat); //restore previous selection by default
+                    preventHandling = false;
                     Forge.openScreen(new MultiSetSelect());
                 }
                 else {
@@ -69,6 +77,12 @@ public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T
         });
     }
 
+    @Override
+    protected void applyChange() {
+        selectedFormat = cbxFormats.getText(); //backup current text
+        super.applyChange();
+    }
+
     @Override
     public void reset() {
         format = null;
@@ -167,9 +181,6 @@ public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T
                 cbxFormats.setText(TextUtil.join(setCodes, ", "));
                 applyChange();
             }
-            else { //if nothing selected, switch to All Sets item
-                cbxFormats.setSelectedIndex(0);
-            }
             super.onClose(canCloseCallback);
         }