Revert stat filter buttons to old behavior

This commit is contained in:
drdev
2014-07-18 17:03:05 +00:00
parent fcc3818a00
commit 68c0d231b4

View File

@@ -10,7 +10,6 @@ import forge.itemmanager.ItemManager;
import forge.itemmanager.SFilterUtil; import forge.itemmanager.SFilterUtil;
import forge.itemmanager.SItemManagerUtil; import forge.itemmanager.SItemManagerUtil;
import forge.itemmanager.SItemManagerUtil.StatTypes; import forge.itemmanager.SItemManagerUtil.StatTypes;
import forge.menu.FTooltip;
import forge.toolbox.FEvent; import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel; import forge.toolbox.FLabel;
@@ -31,27 +30,14 @@ public abstract class StatTypeFilter<T extends InventoryItem> extends ToggleButt
final ToggleButton button = addToggleButton(widget, FSkin.getImages().get(st.skinProp)); final ToggleButton button = addToggleButton(widget, FSkin.getImages().get(st.skinProp));
buttonMap.put(st, button); buttonMap.put(st, button);
//hook so pressing a selected button toggles off all other buttons while remaining toggled //hook so long-pressing a button toggles itself on and toggles off all other buttons
button.setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
if (lockFiltering) { return; }
if (!button.isSelected()) {
lockFiltering = true;
button.setSelected(true);
SFilterUtil.showOnlyStat(st, button, buttonMap);
lockFiltering = false;
}
applyChange();
}
});
//show tooltip when long pressed
button.setLongPressHandler(new FEventHandler() { button.setLongPressHandler(new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
FTooltip tooltip = new FTooltip(st.label); lockFiltering = true;
tooltip.show(button, 0, button.getHeight()); SFilterUtil.showOnlyStat(st, button, buttonMap);
lockFiltering = false;
applyChange();
} }
}); });
} }