From 9bdf08af1ea5f980df9851a9805d8743c7d5cea8 Mon Sep 17 00:00:00 2001 From: Glavo Date: Mon, 22 Jan 2024 21:09:26 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20#2665:=20newBuiltinImage=20=E4=B8=8D?= =?UTF-8?q?=E5=BA=94=E7=BC=93=E5=AD=98=E7=BB=8F=E7=BC=A9=E6=94=BE=E7=9A=84?= =?UTF-8?q?=E5=9B=BE=E5=83=8F=20(#2668)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jackhuang/hmcl/ui/FXUtils.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java index 84810e650..92b5ec2ec 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java @@ -686,7 +686,13 @@ public final class FXUtils { * @see ResourceNotFoundError */ public static Image newBuiltinImage(String url) { - return newBuiltinImage(url, 0, 0, false, false); + return builtinImageCache.computeIfAbsent(url, s -> { + try { + return new Image(s); + } catch (IllegalArgumentException e) { + throw new ResourceNotFoundError("Cannot access image: " + s, e); + } + }); } /** @@ -706,13 +712,11 @@ public final class FXUtils { * @see ResourceNotFoundError */ public static Image newBuiltinImage(String url, double requestedWidth, double requestedHeight, boolean preserveRatio, boolean smooth) { - return builtinImageCache.computeIfAbsent(url, s -> { - try { - return new Image(s, requestedWidth, requestedHeight, preserveRatio, smooth); - } catch (IllegalArgumentException e) { - throw new ResourceNotFoundError("Cannot access image: " + s, e); - } - }); + try { + return new Image(url, requestedWidth, requestedHeight, preserveRatio, smooth); + } catch (IllegalArgumentException e) { + throw new ResourceNotFoundError("Cannot access image: " + url, e); + } } /**