From 871272971e2a0c25b06ea1718c3ef24cbfbdc73b Mon Sep 17 00:00:00 2001 From: elcnesh Date: Tue, 25 Nov 2014 20:14:07 +0000 Subject: [PATCH] Draw effects with orange border to make them easier to distinguish from normal cards. --- .../java/forge/view/arcane/CardPanel.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java index 3d38fd4c694..9af1c9f05a9 100644 --- a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java +++ b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java @@ -290,11 +290,20 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl // White border if card is known to have it. if (getCard() != null && MatchUtil.canCardBeShown(getCard())) { - CardStateView state = getCard().getCurrentState(); - CardEdition ed = FModel.getMagicDb().getEditions().get(state.getSetCode()); - if (ed != null && ed.isWhiteBorder() && state.getFoilIndex() == 0) { - g2d.setColor(Color.white); - int ins = 1; + final CardStateView state = getCard().getCurrentState(); + final CardEdition ed = FModel.getMagicDb().getEditions().get(state.getSetCode()); + boolean colorIsSet = false; + if (state.getType().hasStringType("Effect")) { + // Effects are drawn with orange border + g2d.setColor(Color.ORANGE); + colorIsSet = true; + } else if (ed != null && ed.isWhiteBorder() && state.getFoilIndex() == 0) { + // Non-foil cards from white-bordered sets are drawn with white border + g2d.setColor(Color.WHITE); + colorIsSet = true; + } + if (colorIsSet) { + final int ins = 1; g2d.fillRoundRect(cardXOffset + ins, cardYOffset + ins, cardWidth - ins*2, cardHeight - ins*2, cornerSize-ins, cornerSize-ins); } }