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

Prevent flashback cards losing their display area if graveyard open

Browse Source
This commit is contained in:
drdev
2014-12-02 00:13:50 +00:00
parent bc29bc0d50
commit 8bff9ff14b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
View File

@@ -119,8 +119,11 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
super.clear(); super.clear();
if (!cardPanels.isEmpty()) { if (!cardPanels.isEmpty()) {
for (CardAreaPanel panel : cardPanels) { for (CardAreaPanel panel : cardPanels) {
if (panel.displayArea == null || panel.displayArea == this ||
!panel.displayArea.cardPanels.contains(panel)) { //don't reset if panel's displayed in another area already
panel.reset(); panel.reset();
} }
}
cardPanels.clear(); cardPanels.clear();
} }
} }
@@ -332,6 +335,8 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
} }
private void showZoom() { private void showZoom() {
if (displayArea == null) { return; }
final List<CardView> cards = displayArea.orderedCards; final List<CardView> cards = displayArea.orderedCards;
CardZoom.show(cards, cards.indexOf(getCard()), displayArea); CardZoom.show(cards, cards.indexOf(getCard()), displayArea);
} }