external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure multicolor filter selected after right-clicking a color filter

Browse Source
This commit is contained in:
drdev
2013-11-30 00:56:05 +00:00
parent a0b181e6fe
commit 705264ba9a
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCardCatalog.java
View File

@@ -126,17 +126,21 @@ public enum CCardCatalog implements ICDoc {
for (SItemManagerUtil.StatTypes s : SItemManagerUtil.StatTypes.values()) { for (SItemManagerUtil.StatTypes s : SItemManagerUtil.StatTypes.values()) {
if (s.group == group && s != st) { if (s.group == group && s != st) {
FLabel lbl = VCardCatalog.SINGLETON_INSTANCE.getItemManager().getStatLabel(s); FLabel lbl = VCardCatalog.SINGLETON_INSTANCE.getItemManager().getStatLabel(s);
if (lbl.getSelected()) { if (s == StatTypes.MULTICOLOR) {
if (s == StatTypes.MULTICOLOR) { switch (st) {
switch (st) { case WHITE:
case WHITE: case BLUE:
case BLUE: case BLACK:
case BLACK: case RED:
case RED: case GREEN:
case GREEN: //ensure multicolor filter selected after right-clicking a color filter
continue; //don't filter out multicolor cards after right-clicking a color filter if (!lbl.getSelected()) {
lbl.setSelected(true);
} }
continue;
} }
}
if (lbl.getSelected()) {
foundSelected = true; foundSelected = true;
lbl.setSelected(false); lbl.setSelected(false);
} }

22
forge-gui/src/main/java/forge/gui/workshop/controllers/CWorkshopCatalog.java
View File

@@ -114,17 +114,21 @@ public enum CWorkshopCatalog implements ICDoc {
for (SItemManagerUtil.StatTypes s : SItemManagerUtil.StatTypes.values()) { for (SItemManagerUtil.StatTypes s : SItemManagerUtil.StatTypes.values()) {
if (s.group == group && s != st) { if (s.group == group && s != st) {
FLabel lbl = VWorkshopCatalog.SINGLETON_INSTANCE.getCardManager().getStatLabel(s); FLabel lbl = VWorkshopCatalog.SINGLETON_INSTANCE.getCardManager().getStatLabel(s);
if (lbl.getSelected()) { if (s == StatTypes.MULTICOLOR) {
if (s == StatTypes.MULTICOLOR) { switch (st) {
switch (st) { case WHITE:
case WHITE: case BLUE:
case BLUE: case BLACK:
case BLACK: case RED:
case RED: case GREEN:
case GREEN: //ensure multicolor filter selected after right-clicking a color filter
continue; //don't filter out multicolor cards after right-clicking a color filter if (!lbl.getSelected()) {
lbl.setSelected(true);
} }
continue;
} }
}
if (lbl.getSelected()) {
foundSelected = true; foundSelected = true;
lbl.setSelected(false); lbl.setSelected(false);
} }