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

Don't filter out multicolor cards after right-clicking a color filter

Browse Source
This commit is contained in:
drdev
2013-11-30 00:51:09 +00:00
parent df50a0a38d
commit a0b181e6fe
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,6 +116,7 @@ public enum CCardCatalog implements ICDoc {
final int group = st.group; final int group = st.group;
if (group > 0) { if (group > 0) {
statLabel.setRightClickCommand(new Command() { statLabel.setRightClickCommand(new Command() {
@SuppressWarnings("incomplete-switch")
@Override @Override
public void run() { public void run() {
if (!disableFiltering) { if (!disableFiltering) {
@@ -126,6 +127,16 @@ public enum CCardCatalog implements ICDoc {
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 (lbl.getSelected()) {
if (s == StatTypes.MULTICOLOR) {
switch (st) {
case WHITE:
case BLUE:
case BLACK:
case RED:
case GREEN:
continue; //don't filter out multicolor cards after right-clicking a color filter
}
}
foundSelected = true; foundSelected = true;
lbl.setSelected(false); lbl.setSelected(false);
} }

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

@@ -104,6 +104,7 @@ public enum CWorkshopCatalog implements ICDoc {
final int group = st.group; final int group = st.group;
if (group > 0) { if (group > 0) {
statLabel.setRightClickCommand(new Command() { statLabel.setRightClickCommand(new Command() {
@SuppressWarnings("incomplete-switch")
@Override @Override
public void run() { public void run() {
if (!disableFiltering) { if (!disableFiltering) {
@@ -114,6 +115,16 @@ public enum CWorkshopCatalog implements ICDoc {
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 (lbl.getSelected()) {
if (s == StatTypes.MULTICOLOR) {
switch (st) {
case WHITE:
case BLUE:
case BLACK:
case RED:
case GREEN:
continue; //don't filter out multicolor cards after right-clicking a color filter
}
}
foundSelected = true; foundSelected = true;
lbl.setSelected(false); lbl.setSelected(false);
} }