From fdebee9011a4e1e57f7a0ece03686fbd6e9fb898 Mon Sep 17 00:00:00 2001 From: Agetian Date: Sun, 30 Jun 2013 16:50:43 +0000 Subject: [PATCH] - Foil cards will now be drawn with black border no matter what edition they are from (this currently has the side effect of drawing early core set foils with a black border around a thin white border already present in the picture - will probably be remedied later in one way or another). - Updated the loading progress bar to account for the extra foil sprite sheet. --- src/main/java/forge/gui/toolbox/FSkin.java | 2 +- src/main/java/forge/view/arcane/CardPanel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/forge/gui/toolbox/FSkin.java b/src/main/java/forge/gui/toolbox/FSkin.java index 56d039232f2..14cd6892dfd 100644 --- a/src/main/java/forge/gui/toolbox/FSkin.java +++ b/src/main/java/forge/gui/toolbox/FSkin.java @@ -530,7 +530,7 @@ public enum FSkin { // Everything OK? final FProgressBar barProgress = FView.SINGLETON_INSTANCE.getSplash().getProgressBar(); - setProgessBarMessage("Processing image sprites: ", 4); + setProgessBarMessage("Processing image sprites: ", 5); // Grab and test various sprite files. diff --git a/src/main/java/forge/view/arcane/CardPanel.java b/src/main/java/forge/view/arcane/CardPanel.java index 2e4fc3fee6a..5134fd61788 100644 --- a/src/main/java/forge/view/arcane/CardPanel.java +++ b/src/main/java/forge/view/arcane/CardPanel.java @@ -342,7 +342,7 @@ public class CardPanel extends JPanel implements CardContainer { // White border if card is known to have it. if (this.getGameCard() != null && !this.getGameCard().isFaceDown()) { CardEdition ed = Singletons.getModel().getEditions().get(this.getGameCard().getCurSetCode()); - if (ed != null && ed.isWhiteBorder()) { + if (ed != null && ed.isWhiteBorder() && this.getGameCard().getFoil() == 0) { g2d.setColor(Color.white); int ins = 1; g2d.fillRoundRect(this.cardXOffset + ins, this.cardYOffset + ins, this.cardWidth - ins*2, this.cardHeight - ins*2, cornerSize-ins, cornerSize-ins);