From 3a85ce8e1ae864c3bdb05d7b1b8a3a4da7b65a81 Mon Sep 17 00:00:00 2001 From: Ciilu <109708109+Ciilu@users.noreply.github.com> Date: Sat, 20 Sep 2025 12:57:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/jackhuang/hmcl/ui/ListPageSkin.java | 4 +--- .../java/org/jackhuang/hmcl/ui/download/ModpackPage.java | 3 +-- .../java/org/jackhuang/hmcl/ui/main/SettingsView.java | 6 ++---- .../java/org/jackhuang/hmcl/ui/nbt/NBTEditorPage.java | 9 +++------ .../jackhuang/hmcl/ui/versions/VersionSettingsPage.java | 6 ++---- 5 files changed, 9 insertions(+), 19 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageSkin.java index 5daa81c67..1927b3172 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageSkin.java @@ -64,11 +64,9 @@ public class ListPageSkin extends SkinBase> { vBox.setAlignment(Pos.BOTTOM_RIGHT); vBox.setPickOnBounds(false); - JFXButton btnAdd = new JFXButton(); + JFXButton btnAdd = FXUtils.newRaisedButton(""); FXUtils.setLimitWidth(btnAdd, 40); FXUtils.setLimitHeight(btnAdd, 40); - btnAdd.getStyleClass().add("jfx-button-raised-round"); - btnAdd.setButtonType(JFXButton.ButtonType.RAISED); btnAdd.setGraphic(SVG.ADD.createIcon(Theme.whiteFill(), -1)); btnAdd.setOnAction(e -> skinnable.add()); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackPage.java index c69db9f6c..192e6bc83 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackPage.java @@ -82,8 +82,7 @@ public abstract class ModpackPage extends SpinnerPane implements WizardPage { BorderPane descriptionPane = new BorderPane(); { - btnDescription = new JFXButton(i18n("modpack.description")); - btnDescription.getStyleClass().add("jfx-button-border"); + btnDescription = FXUtils.newBorderButton(i18n("modpack.description")); btnDescription.setOnAction(e -> onDescribe()); descriptionPane.setLeft(btnDescription); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java index b6d31e4f9..c8d0fe994 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java @@ -162,9 +162,8 @@ public abstract class SettingsView extends StackPane { )); { - JFXButton cleanButton = new JFXButton(i18n("launcher.cache_directory.clean")); + JFXButton cleanButton = FXUtils.newBorderButton(i18n("launcher.cache_directory.clean")); cleanButton.setOnAction(e -> clearCacheDirectory()); - cleanButton.getStyleClass().add("jfx-button-border"); fileCommonLocationSublist.setHeaderRight(cleanButton); } @@ -216,9 +215,8 @@ public abstract class SettingsView extends StackPane { if (LOG.getLogFile() == null) openLogFolderButton.setDisable(true); - JFXButton logButton = new JFXButton(i18n("settings.launcher.launcher_log.export")); + JFXButton logButton = FXUtils.newBorderButton(i18n("settings.launcher.launcher_log.export")); logButton.setOnAction(e -> onExportLogs()); - logButton.getStyleClass().add("jfx-button-border"); HBox buttonBox = new HBox(); buttonBox.setSpacing(10); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/nbt/NBTEditorPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/nbt/NBTEditorPage.java index c44a75c4e..3632aa741 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/nbt/NBTEditorPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/nbt/NBTEditorPage.java @@ -27,6 +27,7 @@ import javafx.scene.layout.HBox; import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.ui.Controllers; +import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.construct.MessageDialogPane; import org.jackhuang.hmcl.ui.construct.PageCloseEvent; import org.jackhuang.hmcl.ui.construct.SpinnerPane; @@ -68,9 +69,7 @@ public final class NBTEditorPage extends SpinnerPane implements DecoratorPage { actions.setPadding(new Insets(8)); actions.setAlignment(Pos.CENTER_RIGHT); - JFXButton saveButton = new JFXButton(i18n("button.save")); - saveButton.getStyleClass().add("jfx-button-raised"); - saveButton.setButtonType(JFXButton.ButtonType.RAISED); + JFXButton saveButton = FXUtils.newRaisedButton(i18n("button.save")); saveButton.setOnAction(e -> { try { save(); @@ -80,9 +79,7 @@ public final class NBTEditorPage extends SpinnerPane implements DecoratorPage { } }); - JFXButton cancelButton = new JFXButton(i18n("button.cancel")); - cancelButton.getStyleClass().add("jfx-button-raised"); - cancelButton.setButtonType(JFXButton.ButtonType.RAISED); + JFXButton cancelButton = FXUtils.newRaisedButton(i18n("button.cancel")); cancelButton.setOnAction(e -> fireEvent(new PageCloseEvent())); onEscPressed(this, cancelButton::fire); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java index ff86e1fe1..bcb9aac5e 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java @@ -198,7 +198,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag copyGlobalPane.setLeft(label); BorderPane.setAlignment(label, Pos.CENTER_LEFT); - JFXButton copyAll = new JFXButton(i18n("settings.game.copy_global.copy_all")); + JFXButton copyAll = FXUtils.newBorderButton(i18n("settings.game.copy_global.copy_all")); copyAll.disableProperty().bind(modpack); copyGlobalPane.setRight(copyAll); copyAll.setOnAction(e -> Controllers.confirm(i18n("settings.game.copy_global.copy_all.confirm"), null, () -> { @@ -209,7 +209,6 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag PropertyUtils.copyProperties(profile.getGlobal(), lastVersionSetting, name -> !ignored.contains(name)); }, null)); - copyAll.getStyleClass().add("jfx-button-border"); BorderPane.setAlignment(copyAll, Pos.CENTER_RIGHT); } @@ -456,7 +455,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag showAdvancedSettingPane.setLeft(label); BorderPane.setAlignment(label, Pos.CENTER_LEFT); - JFXButton button = new JFXButton(i18n("settings.advanced.modify")); + JFXButton button = FXUtils.newBorderButton(i18n("settings.advanced.modify")); button.setOnAction(e -> { if (lastVersionSetting != null) { if (advancedVersionSettingPage == null) @@ -465,7 +464,6 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag Controllers.navigate(advancedVersionSettingPage); } }); - button.getStyleClass().add("jfx-button-border"); showAdvancedSettingPane.setRight(button); }