From 06a89dd6a943a3464dcac165aecbd2414270c699 Mon Sep 17 00:00:00 2001 From: Glavo Date: Thu, 8 May 2025 22:36:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BB=8E=20HMCL.jar=20?= =?UTF-8?q?=E6=89=80=E5=9C=A8=E6=96=87=E4=BB=B6=E5=A4=B9=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AD=97=E4=BD=93=20(#3899)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/jackhuang/hmcl/setting/Theme.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java index ccaf06d9b..075d5d4ea 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java @@ -29,6 +29,7 @@ import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.util.Lazy; import org.jackhuang.hmcl.util.Pair; import org.jackhuang.hmcl.util.io.FileUtils; +import org.jackhuang.hmcl.util.io.JarUtils; import java.io.File; import java.io.IOException; @@ -88,7 +89,15 @@ public class Theme { if (font != null) return font; - return tryLoadDefaultFont(Metadata.HMCL_GLOBAL_DIRECTORY); + font = tryLoadDefaultFont(Metadata.HMCL_GLOBAL_DIRECTORY); + if (font != null) + return font; + + Path thisJar = JarUtils.thisJarPath(); + if (thisJar != null && thisJar.getParent() != null) + return tryLoadDefaultFont(thisJar.getParent()); + + return null; }); public static Theme getTheme() {