From 898750d0586f82e9f6a0e096840ebf057d03836b Mon Sep 17 00:00:00 2001 From: Glavo Date: Mon, 4 Nov 2024 18:41:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=B9=E8=AF=9D=E6=A1=86?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E8=87=AA=E8=A1=8C=E7=A7=BB=E5=8A=A8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#3423)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 修复对话框按钮自行移动的问题 * update * update * update --- .../main/java/org/jackhuang/hmcl/setting/Theme.java | 11 +++++++---- HMCL/src/main/resources/assets/css/blue.css | 3 +++ 2 files changed, 10 insertions(+), 4 deletions(-) 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