From eac2740ea8a4ee43006870bf77ba1fb5fe3d5be5 Mon Sep 17 00:00:00 2001 From: neveler <55753029+neveler@users.noreply.github.com> Date: Mon, 30 Mar 2026 21:17:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=B3=E4=BA=8E=E9=A1=B5?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=97=B4=E8=B7=9D=E4=BD=BF=E6=95=B4=E4=BD=93?= =?UTF-8?q?=E9=A3=8E=E6=A0=BC=E6=9B=B4=E5=8A=A0=E7=BB=9F=E4=B8=80=E5=8D=8F?= =?UTF-8?q?=E8=B0=83=0D=20(#5861)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jackhuang/hmcl/ui/main/AboutPage.java | 23 ++++++++----------- .../jackhuang/hmcl/ui/main/FeedbackPage.java | 8 +------ .../org/jackhuang/hmcl/ui/main/HelpPage.java | 5 +--- HMCL/src/main/resources/assets/css/root.css | 5 ++++ 4 files changed, 16 insertions(+), 25 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/AboutPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/AboutPage.java index 3f77289ede..205bfa41b4 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/AboutPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/AboutPage.java @@ -18,10 +18,8 @@ package org.jackhuang.hmcl.ui.main; import com.google.gson.*; -import javafx.geometry.Insets; import javafx.scene.control.ScrollPane; import javafx.scene.image.Image; -import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; import org.jackhuang.hmcl.Metadata; import org.jackhuang.hmcl.theme.Themes; @@ -30,6 +28,7 @@ import org.jackhuang.hmcl.ui.SVG; import org.jackhuang.hmcl.ui.WeakListenerHolder; import org.jackhuang.hmcl.ui.construct.ComponentList; import org.jackhuang.hmcl.ui.construct.LineButton; +import org.jackhuang.hmcl.ui.construct.SpinnerPane; import org.jackhuang.hmcl.util.gson.JsonUtils; import java.io.IOException; @@ -38,11 +37,18 @@ import java.io.InputStream; import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import static org.jackhuang.hmcl.util.logging.Logger.LOG; -public final class AboutPage extends StackPane { +public final class AboutPage extends SpinnerPane { private final WeakListenerHolder holder = new WeakListenerHolder(); public AboutPage() { + VBox content = new VBox(); + content.getStyleClass().add("spinner-pane-content"); + ScrollPane scrollPane = new ScrollPane(content); + scrollPane.setFitToWidth(true); + FXUtils.smoothScrolling(scrollPane); + setContent(scrollPane); + ComponentList about = new ComponentList(); { var launcher = LineButton.createExternalLinkButton(Metadata.PUBLISH_URL); @@ -84,27 +90,16 @@ public final class AboutPage extends StackPane { legal.getContent().setAll(copyright, claim, openSource); } - VBox content = new VBox(16); - content.setPadding(new Insets(10)); content.getChildren().setAll( ComponentList.createComponentListTitle(i18n("about")), about, - ComponentList.createComponentListTitle(i18n("about.thanks_to")), thanks, - ComponentList.createComponentListTitle(i18n("about.dependency")), deps, - ComponentList.createComponentListTitle(i18n("about.legal")), legal ); - - - ScrollPane scrollPane = new ScrollPane(content); - scrollPane.setFitToWidth(true); - FXUtils.smoothScrolling(scrollPane); - getChildren().setAll(scrollPane); } private static Image loadImage(String url) { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/FeedbackPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/FeedbackPage.java index f2c2877abf..789898e469 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/FeedbackPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/FeedbackPage.java @@ -17,7 +17,6 @@ */ package org.jackhuang.hmcl.ui.main; -import javafx.geometry.Insets; import javafx.scene.control.ScrollPane; import javafx.scene.layout.VBox; import org.jackhuang.hmcl.theme.Themes; @@ -37,9 +36,7 @@ public class FeedbackPage extends SpinnerPane { public FeedbackPage() { VBox content = new VBox(); - content.setPadding(new Insets(10)); - content.setSpacing(10); - content.setFillWidth(true); + content.getStyleClass().add("spinner-pane-content"); ScrollPane scrollPane = new ScrollPane(content); scrollPane.setFitToWidth(true); FXUtils.smoothScrolling(scrollPane); @@ -84,8 +81,5 @@ public class FeedbackPage extends SpinnerPane { ComponentList.createComponentListTitle(i18n("contact.feedback")), feedback ); - - this.setContent(content); } - } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/HelpPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/HelpPage.java index 75b81e1d15..ca2c698107 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/HelpPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/HelpPage.java @@ -18,7 +18,6 @@ package org.jackhuang.hmcl.ui.main; import com.google.gson.annotations.SerializedName; -import javafx.geometry.Insets; import javafx.scene.control.ScrollPane; import javafx.scene.layout.VBox; import org.jackhuang.hmcl.Metadata; @@ -42,9 +41,7 @@ public class HelpPage extends SpinnerPane { public HelpPage() { content = new VBox(); - content.setPadding(new Insets(10)); - content.setSpacing(10); - content.setFillWidth(true); + content.getStyleClass().add("spinner-pane-content"); ScrollPane scrollPane = new ScrollPane(content); scrollPane.setFitToWidth(true); FXUtils.smoothScrolling(scrollPane); diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css index 5d1c3dd5df..2d1efc0dd8 100644 --- a/HMCL/src/main/resources/assets/css/root.css +++ b/HMCL/src/main/resources/assets/css/root.css @@ -1463,6 +1463,11 @@ -jfx-radius: 9; } +.spinner-pane .spinner-pane-content { + -fx-padding: 10px; + -fx-spacing: 10px; +} + /******************************************************************************* * * * JFX Combo Box *