external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 09:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1947 from kevlahnota/newmaster2

Browse Source 
fix itemfilter
This commit is contained in:
Anthony Calosa
2022-11-22 23:10:50 +08:00
committed by GitHub
parent cc667cda30 12349f9e82
commit fe619543e6
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-mobile/src/forge/itemmanager/CardManager.java
View File

@@ -2,7 +2,6 @@ package forge.itemmanager;
import java.util.Map.Entry; import java.util.Map.Entry;
import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;
import forge.assets.FSkinFont; import forge.assets.FSkinFont;
@@ -49,8 +48,7 @@ public class CardManager extends ItemManager<PaperCard> {
public static void addDefaultFilters(final ItemManager<? super PaperCard> itemManager) { public static void addDefaultFilters(final ItemManager<? super PaperCard> itemManager) {
itemManager.addFilter(new CardColorFilter(itemManager)); itemManager.addFilter(new CardColorFilter(itemManager));
if (!Forge.isMobileAdventureMode) itemManager.addFilter(new CardFormatFilter(itemManager));
itemManager.addFilter(new CardFormatFilter(itemManager));
itemManager.addFilter(new CardTypeFilter(itemManager)); itemManager.addFilter(new CardTypeFilter(itemManager));
} }

1
forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
View File

@@ -47,6 +47,7 @@ public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T
} }
cbxFormats.addItem(Forge.getLocalizer().getMessage("lblOtherFormats")); cbxFormats.addItem(Forge.getLocalizer().getMessage("lblOtherFormats"));
cbxFormats.addItem(Forge.getLocalizer().getMessage("lblChooseSets")); cbxFormats.addItem(Forge.getLocalizer().getMessage("lblChooseSets"));
cbxFormats.setEnabled(!Forge.isMobileAdventureMode);
selectedFormat = cbxFormats.getText(); selectedFormat = cbxFormats.getText();
cbxFormats.setChangedHandler(new FEventHandler() { cbxFormats.setChangedHandler(new FEventHandler() {