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

- Render Unstable basic lands borderless.

Browse Source
This commit is contained in:
Agetian
2018-01-30 18:14:06 +03:00
parent d8be06c165
commit 0727c83a43
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
View File

@@ -1103,9 +1103,14 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
final int selBorderSize = 1; final int selBorderSize = 1;
// Determine whether to render border from properties // Determine whether to render border from properties
boolean noBorder = !isPreferenceEnabled(ForgePreferences.FPref.UI_RENDER_BLACK_BORDERS) || boolean noBorder = !isPreferenceEnabled(ForgePreferences.FPref.UI_RENDER_BLACK_BORDERS);
(itemInfo.item instanceof IPaperCard && CardView.getCardForUi((IPaperCard)itemInfo.item). if (itemInfo.item instanceof IPaperCard) {
getCurrentState().getSetCode().equalsIgnoreCase("MPS_AKH")); 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 borderSize = noBorder? 0 : Math.round(itemWidth * CardPanel.BLACK_BORDER_SIZE);
final int cornerSize = Math.max(4, Math.round(itemWidth * CardPanel.ROUNDED_CORNER_SIZE)); final int cornerSize = Math.max(4, Math.round(itemWidth * CardPanel.ROUNDED_CORNER_SIZE));

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

@@ -364,7 +364,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
// Amonkhet Invocations
boolean noBorderOnCard = getCard().getCurrentState().getSetCode().equalsIgnoreCase("MPS_AKH"); 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(); boolean cardImgHasAlpha = imagePanel != null && imagePanel.getSrcImage() != null && imagePanel.getSrcImage().getColorModel().hasAlpha();
if (!noBorderPref && !(noBorderOnCard && cardImgHasAlpha)) { if (!noBorderPref && !(noBorderOnCard && cardImgHasAlpha)) {