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 e5b116ad8..a120b6640 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java @@ -153,11 +153,14 @@ public class Theme { .append("-fx-base-text-fill:").append(getColorDisplayName(getForegroundColor())).append(";") .append("-theme-thumb:").append(rgba(paint, 0.7)).append(";"); - if (fontFamily != null) { + if (fontFamily == null) + // https://github.com/HMCL-dev/HMCL/pull/3423 + themeBuilder.append("-fx-font-family: -fx-base-font-family;"); + else themeBuilder.append("-fx-font-family:\"").append(fontFamily).append("\";"); - if (fontStyle != null && !fontStyle.isEmpty()) - themeBuilder.append("-fx-font-style:\"").append(fontStyle).append("\";"); - } + + if (fontStyle != null && !fontStyle.isEmpty()) + themeBuilder.append("-fx-font-style:\"").append(fontStyle).append("\";"); themeBuilder.append('}'); diff --git a/HMCL/src/main/resources/assets/css/blue.css b/HMCL/src/main/resources/assets/css/blue.css index c02cbb1b8..4e427b9c4 100644 --- a/HMCL/src/main/resources/assets/css/blue.css +++ b/HMCL/src/main/resources/assets/css/blue.css @@ -24,5 +24,8 @@ -fx-base-disabled-text-fill: rgba(256, 256, 256, 0.7); -fx-base-text-fill: white; + /* https://github.com/HMCL-dev/HMCL/pull/3423 */ + -fx-font-family: -fx-base-font-family; + -theme-thumb: rgba(92, 107, 192, 0.7); } \ No newline at end of file