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

Commit large scale CardView refactoring to support head-to-head better, handle hidden and face down cards better, and reduce flickering of P/T and other attributes

Browse Source
This commit is contained in:
drdev
2014-10-01 14:15:25 +00:00
parent b12ca2f1dc
commit 4978e34262
23 changed files with 267 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui-desktop/src/main/java/forge/screens/match/VAssignDamage.java
View File

@@ -194,10 +194,11 @@ public class VAssignDamage {
this.damage.put(null, dt);
this.defenders.add(dt);
CardView fakeCard = null;
if (defender instanceof CardView)
if (defender instanceof CardView) {
fakeCard = (CardView)defender;
}
else if (defender instanceof PlayerView) {
fakeCard = new CardView(true);
fakeCard = new CardView(-1);
fakeCard.getOriginal().setName(this.defender.toString());
final PlayerView p = (PlayerView)defender;
fakeCard.setOwner(p);

12
forge-gui-desktop/src/main/java/forge/view/arcane/PlayArea.java
View File

@@ -635,13 +635,11 @@ public class PlayArea extends CardPanelContainer implements CardPanelMouseListen
final List<CardPanel> newPanels = new ArrayList<CardPanel>();
for (final CardView card : toAdd) {
if (card.isUiDisplayable()) { //only include cards that are meant for display
final CardPanel placeholder = new CardPanel(card);
placeholder.setDisplayEnabled(false);
this.getCardPanels().add(placeholder);
this.add(placeholder);
newPanels.add(placeholder);
}
final CardPanel placeholder = new CardPanel(card);
placeholder.setDisplayEnabled(false);
this.getCardPanels().add(placeholder);
this.add(placeholder);
newPanels.add(placeholder);
}
if (!newPanels.isEmpty()) {