Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

[UI] Showing choosable cards in dialog - Issue#456

Browse source
This commit is contained in:
magenoxx 2014-07-15 16:31:41 +04:00
parent 118196c8c3
commit 60d04e2614
7 changed files with 74 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Mage.Client/src/main/java/mage/client/dialog/ShowCardsDialog.java
View file

@ -34,15 +34,6 @@
package mage.client.dialog;
import java.awt.Component;
import java.awt.Point;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.io.Serializable;
import java.util.Map;
import java.util.UUID;
import javax.swing.JLayeredPane;
import javax.swing.SwingUtilities;
import mage.cards.CardDimensions;
import mage.client.MageFrame;
import mage.client.cards.BigCard;
@ -54,6 +45,14 @@ import mage.view.CardsView;
import mage.view.SimpleCardsView;
import org.mage.card.arcane.CardPanel;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.io.Serializable;
import java.util.Map;
import java.util.UUID;
/**
* @author BetaSteward_at_googlemail.com
*/
@ -98,6 +97,10 @@ public class ShowCardsDialog extends MageDialog implements MouseListener {
java.util.List<UUID> chosenCards = (java.util.List<UUID>)options.get("chosen");
cardArea.selectCards(chosenCards);
}
if (options.containsKey("choosable")) {
java.util.List<UUID> choosableCards = (java.util.List<UUID>)options.get("choosable");
cardArea.markCards(choosableCards);
}
}
if (getParent() != MageFrame.getDesktop() /*|| this.isClosed*/) {