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

Prevent adding cards in DualListBox using spacebar if add button disabled

Browse Source 
Prevent selecting cards to discard with Abandon Hope if 0 cards should have been allowed
This commit is contained in:
drdev
2013-12-07 19:54:57 +00:00
parent a90841a6b6
commit 4d2a27f7e8
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui/src/main/java/forge/game/player/PlayerControllerHuman.java
View File

@@ -491,8 +491,8 @@ public class PlayerControllerHuman extends PlayerController {
@Override @Override
public List<Card> chooseCardsToDiscardFrom(Player p, SpellAbility sa, List<Card> valid, int min, int max) { public List<Card> chooseCardsToDiscardFrom(Player p, SpellAbility sa, List<Card> valid, int min, int max) {
if (p != player) { if (p != player) {
int cntToKeepInHand = min == 0 ? -1 : valid.size() - min; return GuiChoose.order("Choose " + min + " card" + (min != 1 ? "s" : "") + " to discard",
return GuiChoose.order("Choose cards to Discard", "Discarded", cntToKeepInHand, valid, null, null); "Discarded", valid.size() - min, valid, null, null);
} }
InputSelectCards inp = new InputSelectCardsFromList(min, max, valid); InputSelectCards inp = new InputSelectCardsFromList(min, max, valid);

4
forge-gui/src/main/java/forge/gui/DualListBox.java
View File

@@ -84,6 +84,8 @@ public class DualListBox<T> extends FPanel {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public void run() { public void run() {
if (!addButton.isEnabled()) { return; }
List<T> selected = new ArrayList<T>(); List<T> selected = new ArrayList<T>();
for (Object item : sourceList.getSelectedValuesList()) { for (Object item : sourceList.getSelectedValuesList()) {
selected.add((T)item); selected.add((T)item);
@@ -99,6 +101,8 @@ public class DualListBox<T> extends FPanel {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public void run() { public void run() {
if (!removeButton.isEnabled()) { return; }
List<T> selected = new ArrayList<T>(); List<T> selected = new ArrayList<T>();
for (Object item : destList.getSelectedValuesList()) { for (Object item : destList.getSelectedValuesList()) {
selected.add((T)item); selected.add((T)item);