From 8c82b1e4397f9dd35fc2fb62d67c532acc2c6057 Mon Sep 17 00:00:00 2001 From: Agetian Date: Sun, 23 Apr 2017 09:44:24 +0000 Subject: [PATCH] - Added an exception for MPS_AKH when visualizing the card border (these cards do not have an actual black border around the card frame, it seems). The way it's currently handled in Forge, there's only a 2px border added around the card, which is necessarily to properly visualize the card selection box and stuff without making it glitch out. So, this is as close to black-borderless as I think can be without introducing visual artifacts. --- .../src/main/java/forge/itemmanager/views/ImageView.java | 9 ++++++++- .../src/main/java/forge/view/arcane/CardPanel.java | 4 +++- 2 files changed, 11 insertions(+), 2 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 49e43be2748..a694c59860e 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 @@ -1095,7 +1095,14 @@ public class ImageView extends ItemView { Rectangle bounds = itemInfo.getBounds(); final int itemWidth = bounds.width; final int selBorderSize = 1; - final int borderSize = Math.round(itemWidth * CardPanel.BLACK_BORDER_SIZE); + + // Unusual border exceptions + boolean noExtraBorder = false; + if (itemInfo.item instanceof IPaperCard) { + noExtraBorder = CardView.getCardForUi((IPaperCard)itemInfo.item).getCurrentState().getSetCode().equalsIgnoreCase("MPS_AKH"); + } + + final int borderSize = noExtraBorder? 2 : Math.round(itemWidth * CardPanel.BLACK_BORDER_SIZE); final int cornerSize = Math.max(4, Math.round(itemWidth * CardPanel.ROUNDED_CORNER_SIZE)); if (itemInfo.selected || itemInfo == hoveredItem) { 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 c0bf3ea8b4d..09125ae389e 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 @@ -303,7 +303,9 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl @Override public final void doLayout() { - final int borderSize = Math.round(cardWidth * CardPanel.BLACK_BORDER_SIZE); + boolean noBorder = getCard().getCurrentState().getSetCode().equalsIgnoreCase("MPS_AKH"); // Unusual border exception + + final int borderSize = noBorder ? 2 : Math.round(cardWidth * CardPanel.BLACK_BORDER_SIZE); final Point imgPos = new Point(cardXOffset + borderSize, cardYOffset + borderSize); final Dimension imgSize = new Dimension(cardWidth - (borderSize * 2), cardHeight - (borderSize * 2));