From b3ae6ef349e7b734eee0247864cbdad6f7e95d82 Mon Sep 17 00:00:00 2001 From: drdev Date: Sun, 20 Sep 2015 15:47:46 +0000 Subject: [PATCH] Add menu to advanced search filter label to make it easier to edit and clear --- .../filters/AdvancedSearchFilter.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java index 3bcdbc82917..8c77983d7cc 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java @@ -4,10 +4,13 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.google.common.base.Predicate; import forge.Forge; +import forge.assets.FSkinImage; import forge.interfaces.IButton; import forge.item.InventoryItem; import forge.itemmanager.AdvancedSearch; import forge.itemmanager.ItemManager; +import forge.menu.FMenuItem; +import forge.menu.FPopupMenu; import forge.menu.FTooltip; import forge.screens.FScreen; import forge.toolbox.FContainer; @@ -96,6 +99,35 @@ public class AdvancedSearchFilter extends ItemFilter @Override public boolean tap(float x, float y, int count) { + if (count == 1) { + FPopupMenu menu = new FPopupMenu() { + @Override + protected void buildMenu() { + addItem(new FMenuItem("Edit Advanced Search", FSkinImage.EDIT, new FEventHandler() { + @Override + public void handleEvent(FEvent e) { + edit(); + } + })); + addItem(new FMenuItem("Clear Advanced Search", FSkinImage.DELETE, new FEventHandler() { + @Override + public void handleEvent(FEvent e) { + reset(); + itemManager.applyNewOrModifiedFilter(AdvancedSearchFilter.this); + } + })); + } + }; + menu.show(this, x, y); + } + else if (count == 2) { + edit(); + } + return true; + } + + @Override + public boolean longPress(float x, float y) { FTooltip tooltip = new FTooltip(toolTipText); tooltip.show(this, x, getHeight()); return true;