From e6711b6b28ca7b4110bad9a1a77167f746a9efc5 Mon Sep 17 00:00:00 2001 From: Agetian Date: Mon, 1 Jun 2015 15:47:55 +0000 Subject: [PATCH] - Morph color leak hack is no longer necessary for the desktop version of the game. --- .../src/main/java/forge/gui/CardDetailPanel.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java b/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java index 93da7ea5264..7ee13993501 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java +++ b/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java @@ -34,7 +34,6 @@ import forge.card.CardDetailUtil; import forge.card.CardDetailUtil.DetailColors; import forge.card.CardEdition; import forge.card.CardRarity; -import forge.card.CardStateName; import forge.game.GameView; import forge.game.card.Card; import forge.game.card.CardView; @@ -238,11 +237,7 @@ public class CardDetailPanel extends SkinnedPanel { setInfoLabel.setBorder(BorderFactory.createLineBorder(foreColor)); } - if (state.getState() == CardStateName.FaceDown) { - updateBorder(state, false); // TODO: HACK! A temporary measure until the morphs still leaking color can be fixed properly. - } else { - updateBorder(state, mayView); - } + updateBorder(state, mayView); powerToughnessLabel.setText(CardDetailUtil.formatPowerToughness(state, mayView));