From 705264ba9af71667a7d029c978bacffaab10bfa8 Mon Sep 17 00:00:00 2001 From: drdev Date: Sat, 30 Nov 2013 00:56:05 +0000 Subject: [PATCH] Ensure multicolor filter selected after right-clicking a color filter --- .../deckeditor/controllers/CCardCatalog.java | 22 +++++++++++-------- .../controllers/CWorkshopCatalog.java | 22 +++++++++++-------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCardCatalog.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCardCatalog.java index 1e948952d74..1ceb618c5de 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCardCatalog.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCardCatalog.java @@ -126,17 +126,21 @@ public enum CCardCatalog implements ICDoc { for (SItemManagerUtil.StatTypes s : SItemManagerUtil.StatTypes.values()) { if (s.group == group && s != st) { FLabel lbl = VCardCatalog.SINGLETON_INSTANCE.getItemManager().getStatLabel(s); - 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 + if (s == StatTypes.MULTICOLOR) { + switch (st) { + case WHITE: + case BLUE: + case BLACK: + case RED: + case GREEN: + //ensure multicolor filter selected after right-clicking a color filter + if (!lbl.getSelected()) { + lbl.setSelected(true); } + continue; } + } + if (lbl.getSelected()) { foundSelected = true; lbl.setSelected(false); } diff --git a/forge-gui/src/main/java/forge/gui/workshop/controllers/CWorkshopCatalog.java b/forge-gui/src/main/java/forge/gui/workshop/controllers/CWorkshopCatalog.java index d2464868407..dbd263c8850 100644 --- a/forge-gui/src/main/java/forge/gui/workshop/controllers/CWorkshopCatalog.java +++ b/forge-gui/src/main/java/forge/gui/workshop/controllers/CWorkshopCatalog.java @@ -114,17 +114,21 @@ public enum CWorkshopCatalog implements ICDoc { for (SItemManagerUtil.StatTypes s : SItemManagerUtil.StatTypes.values()) { if (s.group == group && s != st) { FLabel lbl = VWorkshopCatalog.SINGLETON_INSTANCE.getCardManager().getStatLabel(s); - 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 + if (s == StatTypes.MULTICOLOR) { + switch (st) { + case WHITE: + case BLUE: + case BLACK: + case RED: + case GREEN: + //ensure multicolor filter selected after right-clicking a color filter + if (!lbl.getSelected()) { + lbl.setSelected(true); } + continue; } + } + if (lbl.getSelected()) { foundSelected = true; lbl.setSelected(false); }