diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java index 3e048b18205..f9dde710993 100644 --- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java @@ -703,7 +703,7 @@ public abstract class ItemManager extends FContainer im filterPredicate = newFilterPredicate; if (pool != null) { - updateView(true, getSelectedItems()); + updateView(true, null); } return true; } diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java index a3da1307c7a..1b3e0c406d5 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java @@ -1,5 +1,6 @@ package forge.itemmanager.filters; +import forge.assets.FSkinFont; import forge.game.GameFormat; import forge.item.InventoryItem; import forge.itemmanager.ItemManager; @@ -19,27 +20,31 @@ public abstract class FormatFilter extends ItemFilter itemManager0) { super(itemManager0); - cbxFormats.addItem("All Formats"); + cbxFormats.setFont(FSkinFont.get(12)); + cbxFormats.addItem("All Sets/Formats"); for (GameFormat format : FModel.getFormats().getOrderedList()) { cbxFormats.addItem(format); } - cbxFormats.addItem("More..."); + cbxFormats.addItem("Choose Sets..."); + cbxFormats.setSelectedIndex(0); + cbxFormats.setChangedHandler(new FEventHandler() { @Override public void handleEvent(FEvent e) { if (cbxFormats.getSelectedIndex() == 0) { formats.clear(); + applyChange(); } else if (cbxFormats.getSelectedIndex() < cbxFormats.getItemCount() - 1) { formats.clear(); formats.add((GameFormat)cbxFormats.getSelectedItem()); + applyChange(); } else { //TODO: Open screen to select one or more sets and/or formats } } }); - cbxFormats.setSelectedIndex(0); } @Override