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

Fix so cards hidden in zone popup when appropriate

Browse Source
This commit is contained in:
drdev
2014-10-15 02:43:31 +00:00
parent c8de1c884c
commit 6b71a89026
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java
View File

@@ -268,7 +268,7 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
g2d.fillRoundRect(cardXOffset - n, (cardYOffset - n) + offset, cardWidth + (n * 2), cardHeight + (n * 2), cornerSize + n , cornerSize + n); g2d.fillRoundRect(cardXOffset - n, (cardYOffset - n) + offset, cardWidth + (n * 2), cardHeight + (n * 2), cornerSize + n , cornerSize + n);
// White border if card is known to have it. // White border if card is known to have it.
if (getCard() != null) { if (getCard() != null && MatchUtil.canCardBeShown(getCard())) {
CardStateView state = getCard().getCurrentState(); CardStateView state = getCard().getCurrentState();
CardEdition ed = FModel.getMagicDb().getEditions().get(state.getSetCode()); CardEdition ed = FModel.getMagicDb().getEditions().get(state.getSetCode());
if (ed != null && ed.isWhiteBorder() && state.getFoilIndex() == 0) { if (ed != null && ed.isWhiteBorder() && state.getFoilIndex() == 0) {
@@ -318,10 +318,11 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
imagePanel.setLocation(imgPos); imagePanel.setLocation(imgPos);
imagePanel.setSize(imgSize); imagePanel.setSize(imgSize);
boolean canShow = MatchUtil.canCardBeShown(card);
boolean showText = !imagePanel.hasImage() || !isAnimationPanel; boolean showText = !imagePanel.hasImage() || !isAnimationPanel;
displayCardNameOverlay(showText && showCardNameOverlay(), imgSize, imgPos); displayCardNameOverlay(showText && canShow && showCardNameOverlay(), imgSize, imgPos);
displayPTOverlay(showText && showCardPowerOverlay(), imgSize, imgPos); displayPTOverlay(showText && (canShow || card.isFaceDown()) && showCardPowerOverlay(), imgSize, imgPos);
displayCardIdOverlay(showText && showCardIdOverlay(), imgSize, imgPos); displayCardIdOverlay(showText && showCardIdOverlay(), imgSize, imgPos);
} }
@@ -367,7 +368,7 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
} }
private void displayIconOverlay(final Graphics g) { private void displayIconOverlay(final Graphics g) {
if (showCardManaCostOverlay() && cardWidth < 200) { if (showCardManaCostOverlay() && cardWidth < 200 && MatchUtil.canCardBeShown(card)) {
final boolean showSplitMana = card.isSplitCard(); final boolean showSplitMana = card.isSplitCard();
if (!showSplitMana) { if (!showSplitMana) {
drawManaCost(g, card.getCurrentState().getManaCost(), 0); drawManaCost(g, card.getCurrentState().getManaCost(), 0);