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

- Minor clarifications in CardPanel.

Browse Source
This commit is contained in:
Agetian
2017-06-11 05:16:13 +00:00
parent d9d336a39e
commit ada8cc7b8a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,10 +230,11 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
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(); boolean cardImgHasAlpha = imagePanel != null && imagePanel.getSrcImage() != null && imagePanel.getSrcImage().getColorModel().hasAlpha();
final int cornerSize = noBorderPref && !hasAlpha ? 0 : Math.max(4, Math.round(cardWidth * CardPanel.ROUNDED_CORNER_SIZE)); // if we are rendering borderless and the card has no alpha channel, use square corners to avoid visual glitches with highlight frames.
final int offset = isTapped() && (!noBorderPref || hasAlpha) ? 1 : 0; final int cornerSize = noBorderPref && !cardImgHasAlpha ? 0 : Math.max(4, Math.round(cardWidth * CardPanel.ROUNDED_CORNER_SIZE));
final int offset = isTapped() && (!noBorderPref || cardImgHasAlpha) ? 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,11 +314,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(); boolean cardImgHasAlpha = imagePanel != null && imagePanel.getSrcImage() != null && imagePanel.getSrcImage().getColorModel().hasAlpha();
int borderSize = 0; int borderSize = 0;
if (!noBorderPref && !(noBorderOnCard && hasAlpha)) { if (!noBorderPref && !(noBorderOnCard && cardImgHasAlpha)) {
// 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);
} }