From 94064a2a135a57b37e6fe5fe4c4519b7ad008e97 Mon Sep 17 00:00:00 2001 From: "Peter F. Patel-Schneider" Date: Sun, 20 Jan 2019 21:16:34 -0500 Subject: [PATCH] Fix bug in chooseEntitiesforEffect in Mobile GUI --- forge-gui-mobile/src/forge/screens/match/MatchController.java | 4 +++- forge-gui-mobile/src/forge/toolbox/GuiChoose.java | 2 +- forge-gui/src/main/java/forge/util/gui/SGuiChoose.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java index 3eef6be8e79..0a5a83b664a 100644 --- a/forge-gui-mobile/src/forge/screens/match/MatchController.java +++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java @@ -517,7 +517,9 @@ public class MatchController extends AbstractGuiGame { @Override public List chooseEntitiesForEffect(String title, List optionList, int min, int max, DelayedReveal delayedReveal) { - return SGuiChoose.order(title, "Selected", min, max, (List) optionList, null); + final int m1 = max >= 0 ? optionList.size() - max : -1; + final int m2 = min >= 0 ? optionList.size() - min : -1; + return SGuiChoose.order(title, "Selected", m1, m2, (List) optionList, null); } @Override diff --git a/forge-gui-mobile/src/forge/toolbox/GuiChoose.java b/forge-gui-mobile/src/forge/toolbox/GuiChoose.java index cee2380a441..0b369d8fe4c 100644 --- a/forge-gui-mobile/src/forge/toolbox/GuiChoose.java +++ b/forge-gui-mobile/src/forge/toolbox/GuiChoose.java @@ -244,8 +244,8 @@ public class GuiChoose { } public static void many(final String title, final String topCaption, int min, int max, final List sourceChoices, CardView referenceCard, final Callback> callback) { - int m2 = min >= 0 ? sourceChoices.size() - min : -1; int m1 = max >= 0 ? sourceChoices.size() - max : -1; + int m2 = min >= 0 ? sourceChoices.size() - min : -1; order(title, topCaption, m1, m2, sourceChoices, null, referenceCard, callback); } diff --git a/forge-gui/src/main/java/forge/util/gui/SGuiChoose.java b/forge-gui/src/main/java/forge/util/gui/SGuiChoose.java index df549cfb93c..0575d80adb6 100644 --- a/forge-gui/src/main/java/forge/util/gui/SGuiChoose.java +++ b/forge-gui/src/main/java/forge/util/gui/SGuiChoose.java @@ -163,8 +163,8 @@ public class SGuiChoose { } public static List many(final String title, final String topCaption, final int min, final int max, final List sourceChoices) { - final int m2 = min >= 0 ? sourceChoices.size() - min : -1; final int m1 = max >= 0 ? sourceChoices.size() - max : -1; + final int m2 = min >= 0 ? sourceChoices.size() - min : -1; return order(title, topCaption, m1, m2, sourceChoices, null); }