From 0727c83a430170929495318543f61dfe38542f9f Mon Sep 17 00:00:00 2001 From: Agetian Date: Tue, 30 Jan 2018 18:14:06 +0300 Subject: [PATCH] - Render Unstable basic lands borderless. --- .../main/java/forge/itemmanager/views/ImageView.java | 11 ++++++++--- .../src/main/java/forge/view/arcane/CardPanel.java | 4 ++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java index 687d3e6b1f6..1bc5d5a8cc6 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java @@ -1103,9 +1103,14 @@ public class ImageView extends ItemView { final int selBorderSize = 1; // Determine whether to render border from properties - boolean noBorder = !isPreferenceEnabled(ForgePreferences.FPref.UI_RENDER_BLACK_BORDERS) || - (itemInfo.item instanceof IPaperCard && CardView.getCardForUi((IPaperCard)itemInfo.item). - getCurrentState().getSetCode().equalsIgnoreCase("MPS_AKH")); + boolean noBorder = !isPreferenceEnabled(ForgePreferences.FPref.UI_RENDER_BLACK_BORDERS); + if (itemInfo.item instanceof IPaperCard) { + CardView cv = CardView.getCardForUi((IPaperCard) itemInfo.item); + // Amonkhet Invocations + noBorder |= cv.getCurrentState().getSetCode().equalsIgnoreCase("MPS_AKH"); + // Unstable basic lands + noBorder |= cv.getCurrentState().isBasicLand() && cv.getCurrentState().getSetCode().equalsIgnoreCase("UST"); + } final int borderSize = noBorder? 0 : Math.round(itemWidth * CardPanel.BLACK_BORDER_SIZE); final int cornerSize = Math.max(4, Math.round(itemWidth * CardPanel.ROUNDED_CORNER_SIZE)); 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 6207cbc9582..7a0f2d39fad 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 @@ -364,7 +364,11 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl boolean noBorderPref = !isPreferenceEnabled(FPref.UI_RENDER_BLACK_BORDERS); // Borderless cards should be accounted for here + // Amonkhet Invocations boolean noBorderOnCard = getCard().getCurrentState().getSetCode().equalsIgnoreCase("MPS_AKH"); + // Unstable basic lands + noBorderOnCard |= getCard().getCurrentState().isBasicLand() && getCard().getCurrentState().getSetCode().equalsIgnoreCase("UST"); + boolean cardImgHasAlpha = imagePanel != null && imagePanel.getSrcImage() != null && imagePanel.getSrcImage().getColorModel().hasAlpha(); if (!noBorderPref && !(noBorderOnCard && cardImgHasAlpha)) {