From 669a9dfc5736e879ff155c28dcf430f545bdf95f Mon Sep 17 00:00:00 2001 From: Glavo Date: Tue, 2 Dec 2025 21:14:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9B=B4=E6=96=B0=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E7=9A=84=E9=A2=9C=E8=89=B2=20(#4903)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jackhuang/hmcl/setting/StyleSheets.java | 1 + .../java/org/jackhuang/hmcl/ui/UpgradeDialog.java | 4 ++-- .../java/org/jackhuang/hmcl/ui/main/MainPage.java | 5 +---- HMCL/src/main/resources/assets/css/blue.css | 1 + HMCL/src/main/resources/assets/css/root.css | 11 +++++++---- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/StyleSheets.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/StyleSheets.java index 0d62486bc..3d2142e57 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/StyleSheets.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/StyleSheets.java @@ -181,6 +181,7 @@ public final class StyleSheets { addColor(builder, scheme, ColorRole.ON_SURFACE_VARIANT, 0.38); addColor(builder, scheme, ColorRole.SURFACE_CONTAINER_LOW, 0.8); addColor(builder, scheme, ColorRole.SECONDARY_CONTAINER, 0.8); + addColor(builder, scheme, ColorRole.INVERSE_SURFACE, 0.8); builder.append("}\n"); return toStyleSheetUri(builder.toString(), blueCss); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java index 09845c8c3..74c3b79e8 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java @@ -19,8 +19,8 @@ package org.jackhuang.hmcl.ui; import com.jfoenix.controls.JFXButton; import com.jfoenix.controls.JFXDialogLayout; +import com.jfoenix.controls.JFXSpinner; import javafx.scene.control.Label; -import javafx.scene.control.ProgressIndicator; import javafx.scene.control.ScrollPane; import org.jackhuang.hmcl.Metadata; import org.jackhuang.hmcl.task.Schedulers; @@ -48,7 +48,7 @@ public final class UpgradeDialog extends JFXDialogLayout { maxHeightProperty().bind(Controllers.getScene().heightProperty().multiply(0.7)); setHeading(new Label(i18n("update.changelog"))); - setBody(new ProgressIndicator()); + setBody(new JFXSpinner()); String url = CHANGELOG_URL + remoteVersion.getChannel().channelName + ".html"; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java index 4a09a676e..785fd5c17 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java @@ -188,16 +188,13 @@ public final class MainPage extends StackPane implements DecoratorPage { StackPane.setAlignment(hBox, Pos.CENTER_LEFT); StackPane.setMargin(hBox, new Insets(9, 12, 9, 16)); { - Label lblIcon = new Label(); - lblIcon.setGraphic(SVG.UPDATE.createIcon(20)); - TwoLineListItem prompt = new TwoLineListItem(); prompt.setSubtitle(i18n("update.bubble.subtitle")); prompt.setPickOnBounds(false); prompt.titleProperty().bind(BindingMapping.of(latestVersionProperty()).map(latestVersion -> latestVersion == null ? "" : i18n("update.bubble.title", latestVersion.getVersion()))); - hBox.getChildren().setAll(lblIcon, prompt); + hBox.getChildren().setAll(SVG.UPDATE.createIcon(20), prompt); } JFXButton closeUpdateButton = new JFXButton(); diff --git a/HMCL/src/main/resources/assets/css/blue.css b/HMCL/src/main/resources/assets/css/blue.css index d9054f220..98c5336b4 100644 --- a/HMCL/src/main/resources/assets/css/blue.css +++ b/HMCL/src/main/resources/assets/css/blue.css @@ -56,4 +56,5 @@ -monet-on-surface-variant-transparent-38: #45465161; -monet-surface-container-low-transparent-80: #F5F2FACC; -monet-secondary-container-transparent-80: #D0D5FDCC; + -monet-inverse-surface-transparent-80: #303036CC; } \ No newline at end of file diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css index 3fcf4e36d..d2de53678 100644 --- a/HMCL/src/main/resources/assets/css/root.css +++ b/HMCL/src/main/resources/assets/css/root.css @@ -355,14 +355,17 @@ } .bubble { - -fx-background-color: rgba(0, 0, 0, 0.5); + -fx-background-color: -monet-inverse-surface-transparent-80; -fx-background-radius: 2px; - -fx-text-fill: white; } .bubble > HBox > .two-line-list-item > .first-line > .title, .bubble > HBox > .two-line-list-item > HBox > .subtitle { - -fx-text-fill: white; + -fx-text-fill: -monet-inverse-on-surface; +} + +.bubble .svg { + -fx-fill: -monet-inverse-on-surface; } .sponsor-pane { @@ -1638,7 +1641,7 @@ } .html-hyperlink { - -fx-fill: blue; + -fx-fill: -monet-primary; } .html-h1 {