external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- If the card picture is an image with transparency, do not enforce non-rounded corners and thin border when drawing it.

Browse Source
This commit is contained in:
Agetian
2017-06-11 04:53:54 +00:00
parent c145502c8f
commit d9d336a39e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java
View File

@@ -229,11 +229,11 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
final Graphics2D g2d = (Graphics2D) g; final Graphics2D g2d = (Graphics2D) g;
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
// in "no borders" mode, use square card corners to avoid highlight glitches
boolean noBorderPref = !isPreferenceEnabled(FPref.UI_RENDER_BLACK_BORDERS); boolean noBorderPref = !isPreferenceEnabled(FPref.UI_RENDER_BLACK_BORDERS);
boolean hasAlpha = imagePanel != null && imagePanel.getSrcImage() != null && imagePanel.getSrcImage().getColorModel().hasAlpha();
final int cornerSize = noBorderPref ? 0 : Math.max(4, Math.round(cardWidth * CardPanel.ROUNDED_CORNER_SIZE)); final int cornerSize = noBorderPref && !hasAlpha ? 0 : Math.max(4, Math.round(cardWidth * CardPanel.ROUNDED_CORNER_SIZE));
final int offset = isTapped() && !noBorderPref ? 1 : 0; final int offset = isTapped() && (!noBorderPref || hasAlpha) ? 1 : 0;
// Magenta outline for when card was chosen to pay // Magenta outline for when card was chosen to pay
if (matchUI.isUsedToPay(getCard())) { if (matchUI.isUsedToPay(getCard())) {
@@ -313,10 +313,11 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
boolean noBorderPref = !isPreferenceEnabled(FPref.UI_RENDER_BLACK_BORDERS); boolean noBorderPref = !isPreferenceEnabled(FPref.UI_RENDER_BLACK_BORDERS);
// Borderless cards should be accounted for here // Borderless cards should be accounted for here
boolean noBorderOnCard = getCard().getCurrentState().getSetCode().equalsIgnoreCase("MPS_AKH"); boolean noBorderOnCard = getCard().getCurrentState().getSetCode().equalsIgnoreCase("MPS_AKH");
boolean hasAlpha = imagePanel != null && imagePanel.getSrcImage() != null && imagePanel.getSrcImage().getColorModel().hasAlpha();
int borderSize = 0; int borderSize = 0;
if (!noBorderPref) { if (!noBorderPref && !(noBorderOnCard && hasAlpha)) {
// A 2 px border is necessary to ensure the rounded card corners don't glitch when the card is highlighted // A 2 px border is necessary to ensure the rounded card corners don't glitch when the card is highlighted
borderSize = noBorderOnCard ? 2 : Math.round(cardWidth * CardPanel.BLACK_BORDER_SIZE); borderSize = noBorderOnCard ? 2 : Math.round(cardWidth * CardPanel.BLACK_BORDER_SIZE);
} }