External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki 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

4
Mage.Client/src/main/java/mage/client/cards/Card.java
View file

@ -530,4 +530,8 @@ public class Card extends MagePermanent implements MouseMotionListener, MouseLis
@Override
public void setCardAreaRef(JPanel cardArea) {
}
@Override
public void setChoosable(boolean isChoosable) {
}
}

27
Mage.Client/src/main/java/mage/client/cards/CardArea.java
View file

@ -28,16 +28,6 @@
package mage.client.cards;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Rectangle;
import java.awt.event.MouseListener;
import java.util.List;
import java.util.UUID;
import javax.swing.JLayeredPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import mage.cards.CardDimensions;
import mage.cards.MageCard;
import mage.client.plugins.impl.Plugins;
@ -49,6 +39,12 @@ import mage.view.CardsView;
import mage.view.SimpleCardsView;
import org.mage.card.arcane.CardPanel;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseListener;
import java.util.List;
import java.util.UUID;
public class CardArea extends JPanel {
private boolean reloaded = false;
@ -179,4 +175,15 @@ public class CardArea extends JPanel {
}
}
public void markCards(List<UUID> marked) {
for (Component component : cardArea.getComponents()) {
if (component instanceof MageCard) {
MageCard mageCard = (MageCard)component;
if (marked.contains(mageCard.getOriginal().getId())) {
mageCard.setChoosable(true);
}
}
}
}
}

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*/) {

19
Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
View file

@ -81,6 +81,7 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
private boolean isSelected;
private boolean isPlayable;
private boolean isChoosable;
private boolean showCastingCost;
private boolean hasImage = false;
private float alpha = 1.0f;
@ -353,8 +354,16 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
@Override
public void setSelected(boolean isSelected) {
this.isSelected = isSelected;
this.titleText.setGlowColor(Color.green);
repaint();
if (isSelected) {
this.titleText.setGlowColor(Color.green);
}
// noxx: bad idea is to call repaint in setter method
////repaint();
}
@Override
public void setChoosable(boolean isChoosable) {
this.isChoosable = isChoosable;
}
@Override
@ -411,9 +420,13 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
int cornerSize = Math.max(4, Math.round(cardWidth * ROUNDED_CORNER_SIZE));
g2d.fillRoundRect(cardXOffset, cardYOffset, cardWidth, cardHeight, cornerSize, cornerSize);
if (isSelected) {
g2d.setColor(Color.green);
g2d.fillRoundRect(cardXOffset + 1, cardYOffset + 1, cardWidth - 2, cardHeight - 2, cornerSize, cornerSize);
} else if (isChoosable) {
g2d.setColor(new Color(250, 250, 0, 230));
g2d.fillRoundRect(cardXOffset + 1, cardYOffset + 1, cardWidth - 2, cardHeight - 2, cornerSize, cornerSize);
}
if (isPlayable) {
@ -421,7 +434,6 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
g2d.fillRoundRect(cardXOffset + 1, cardYOffset + 1, cardWidth - 2, cardHeight - 2, cornerSize, cornerSize);
}
//g2d.setColor(new Color(200, 120, 40, 200));
//TODO:uncomment
/*
@ -689,6 +701,7 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
setText(card);
this.isPlayable = card.isPlayable();
this.isChoosable = card.isChoosable();
boolean updateImage = !gameCard.getName().equals(card.getName()) || gameCard.isFaceDown() != card.isFaceDown(); // update after e.g. turning a night/day card
this.gameCard = card;