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

Pass CardView from scaleImage() too

Browse Source
This commit is contained in:
Lyu Zong-Hong
2021-07-27 13:48:46 +09:00
parent 5f39b98cc5
commit 8f70a6ab96
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-gui-desktop/src/main/java/forge/ImageCache.java
View File

@@ -100,7 +100,7 @@ public class ImageCache {
*/ */
public static BufferedImage getImage(final CardView card, final Iterable<PlayerView> viewers, final int width, final int height) { public static BufferedImage getImage(final CardView card, final Iterable<PlayerView> viewers, final int width, final int height) {
final String key = card.getCurrentState().getImageKey(viewers); final String key = card.getCurrentState().getImageKey(viewers);
return scaleImage(key, width, height, true); return scaleImage(key, width, height, true, card);
} }
/** /**
@@ -110,7 +110,7 @@ public class ImageCache {
*/ */
public static BufferedImage getImageNoDefault(final CardView card, final Iterable<PlayerView> viewers, final int width, final int height) { public static BufferedImage getImageNoDefault(final CardView card, final Iterable<PlayerView> viewers, final int width, final int height) {
final String key = card.getCurrentState().getImageKey(viewers); final String key = card.getCurrentState().getImageKey(viewers);
return scaleImage(key, width, height, false); return scaleImage(key, width, height, false, card);
} }
/** /**
@@ -121,7 +121,7 @@ public class ImageCache {
return getImage(ii, width, height, false); return getImage(ii, width, height, false);
} }
public static BufferedImage getImage(InventoryItem ii, int width, int height, boolean altState) { public static BufferedImage getImage(InventoryItem ii, int width, int height, boolean altState) {
return scaleImage(ii.getImageKey(altState), width, height, true); return scaleImage(ii.getImageKey(altState), width, height, true, null);
} }
/** /**
@@ -131,7 +131,7 @@ public class ImageCache {
public static SkinIcon getIcon(String imageKey) { public static SkinIcon getIcon(String imageKey) {
final BufferedImage i; final BufferedImage i;
if (_missingIconKeys.contains(imageKey) || if (_missingIconKeys.contains(imageKey) ||
null == (i = scaleImage(imageKey, -1, -1, false))) { null == (i = scaleImage(imageKey, -1, -1, false, null))) {
_missingIconKeys.add(imageKey); _missingIconKeys.add(imageKey);
return FSkin.getIcon(FSkinProp.ICO_UNKNOWN); return FSkin.getIcon(FSkinProp.ICO_UNKNOWN);
} }
@@ -145,6 +145,9 @@ public class ImageCache {
* If the requested image is not present in the cache then it attempts to load * If the requested image is not present in the cache then it attempts to load
* the image from file (slower) and then add it to the cache for fast future access. * the image from file (slower) and then add it to the cache for fast future access.
* </p> * </p>
*
* @param cardView This is for emblem, since there is no paper card for them
*
*/ */
public static BufferedImage getOriginalImage(String imageKey, boolean useDefaultIfNotFound, CardView cardView) { public static BufferedImage getOriginalImage(String imageKey, boolean useDefaultIfNotFound, CardView cardView) {
if (null == imageKey) { if (null == imageKey) {
@@ -221,7 +224,8 @@ public class ImageCache {
return original; return original;
} }
public static BufferedImage scaleImage(String key, final int width, final int height, boolean useDefaultImage) { // cardView is for Emblem, since there is no paper card for them
public static BufferedImage scaleImage(String key, final int width, final int height, boolean useDefaultImage, CardView cardView) {
if (StringUtils.isEmpty(key) || (3 > width && -1 != width) || (3 > height && -1 != height)) { if (StringUtils.isEmpty(key) || (3 > width && -1 != width) || (3 > height && -1 != height)) {
// picture too small or key not defined; return a blank // picture too small or key not defined; return a blank
return null; return null;
@@ -235,7 +239,7 @@ public class ImageCache {
return cached; return cached;
} }
BufferedImage original = getOriginalImage(key, useDefaultImage, null); BufferedImage original = getOriginalImage(key, useDefaultImage, cardView);
if (original == null) { return null; } if (original == null) { return null; }
if (original == _defaultImage) { if (original == _defaultImage) {

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

@@ -1223,7 +1223,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
int scale = CardFaceSymbols.getHeight() * cornerSize/8; int scale = CardFaceSymbols.getHeight() * cornerSize/8;
int scaleArt = CardFaceSymbols.getHeight() * cornerSize/7; int scaleArt = CardFaceSymbols.getHeight() * cornerSize/7;
BufferedImage cardImage = ImageCache.scaleImage(deckImageKey, bounds.width, bounds.height, false); BufferedImage cardImage = ImageCache.scaleImage(deckImageKey, bounds.width, bounds.height, false, null);
if (cardImage == null) { if (cardImage == null) {
//draw generic box //draw generic box