Skip to content

Commit fcb4e05

Browse files
committed
尝试从 HMCL.jar 所在文件夹加载默认字体
1 parent 4eee79d commit fcb4e05

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

  • HMCL/src/main/java/org/jackhuang/hmcl/setting

HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.jackhuang.hmcl.util.Lazy;
3030
import org.jackhuang.hmcl.util.Pair;
3131
import org.jackhuang.hmcl.util.io.FileUtils;
32+
import org.jackhuang.hmcl.util.io.JarUtils;
3233

3334
import java.io.File;
3435
import java.io.IOException;
@@ -88,7 +89,15 @@ private static Font tryLoadDefaultFont(Path dir) {
8889
if (font != null)
8990
return font;
9091

91-
return tryLoadDefaultFont(Metadata.HMCL_GLOBAL_DIRECTORY);
92+
font = tryLoadDefaultFont(Metadata.HMCL_GLOBAL_DIRECTORY);
93+
if (font != null)
94+
return font;
95+
96+
Path thisJar = JarUtils.thisJarPath();
97+
if (thisJar != null && thisJar.getParent() != null)
98+
return tryLoadDefaultFont(thisJar.getParent());
99+
100+
return null;
92101
});
93102

94103
public static Theme getTheme() {

0 commit comments

Comments
 (0)