From cf145c8c526528938000fcf707595da8c36f8e1a Mon Sep 17 00:00:00 2001 From: Damon Lu <59256766+WhatDamon@users.noreply.github.com> Date: Sun, 11 Jan 2026 11:30:03 +0800 Subject: [PATCH 1/3] update --- .../main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java | 10 +++++++++- .../hmcl/ui/account/ClassicAccountLoginDialog.java | 2 +- .../jackhuang/hmcl/ui/account/CreateAccountPane.java | 2 +- .../hmcl/ui/account/OfflineAccountSkinPane.java | 2 +- .../org/jackhuang/hmcl/ui/construct/DialogPane.java | 2 +- .../jackhuang/hmcl/ui/construct/InputDialogPane.java | 2 +- .../jackhuang/hmcl/ui/construct/MessageDialogPane.java | 4 ++-- .../java/org/jackhuang/hmcl/ui/nbt/NBTEditorPage.java | 2 +- 8 files changed, 17 insertions(+), 9 deletions(-) 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 74c3b79e8b..709c95866b 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java @@ -22,6 +22,9 @@ import com.jfoenix.controls.JFXSpinner; import javafx.scene.control.Label; import javafx.scene.control.ScrollPane; +import javafx.scene.layout.HBox; +import javafx.scene.layout.Priority; +import javafx.scene.layout.Region; import org.jackhuang.hmcl.Metadata; import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task; @@ -113,7 +116,12 @@ public UpgradeDialog(RemoteVersion remoteVersion, Runnable updateRunnable) { cancelButton.getStyleClass().add("dialog-cancel"); cancelButton.setOnAction(e -> fireEvent(new DialogCloseEvent())); - setActions(openInBrowser, updateButton, cancelButton); + Region spacer = new Region(); + HBox.setHgrow(spacer, Priority.ALWAYS); + + HBox hBox = new HBox(openInBrowser, spacer, cancelButton, updateButton); + + setActions(hBox); onEscPressed(this, cancelButton::fire); } } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/ClassicAccountLoginDialog.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/ClassicAccountLoginDialog.java index 19bd4510e5..5c47774fb6 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/ClassicAccountLoginDialog.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/ClassicAccountLoginDialog.java @@ -90,7 +90,7 @@ public ClassicAccountLoginDialog(ClassicAccount oldAccount, Consumer s cancelButton.setOnAction(e -> onCancel()); cancelButton.getStyleClass().add("dialog-cancel"); - dialogLayout.setActions(lblCreationWarning, acceptButton, cancelButton); + dialogLayout.setActions(lblCreationWarning, cancelButton, acceptButton); } getChildren().setAll(dialogLayout); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/CreateAccountPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/CreateAccountPane.java index 98ddaf3981..d7d3d09579 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/CreateAccountPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/CreateAccountPane.java @@ -146,7 +146,7 @@ public CreateAccountPane(AccountFactory factory) { btnCancel.setOnAction(e -> onCancel()); onEscPressed(this, btnCancel::fire); - HBox hbox = new HBox(spinner, btnCancel); + HBox hbox = new HBox(btnCancel, spinner); hbox.setAlignment(Pos.CENTER_RIGHT); setActions(lblErrorMessage, hbox); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/OfflineAccountSkinPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/OfflineAccountSkinPane.java index 5317b3c422..e7876cf316 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/OfflineAccountSkinPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/OfflineAccountSkinPane.java @@ -218,7 +218,7 @@ public OfflineAccountSkinPane(OfflineAccount account) { cancelButton.setOnAction(e -> fireEvent(new DialogCloseEvent())); onEscPressed(this, cancelButton::fire); - layout.setActions(littleSkinLink, acceptButton, cancelButton); + layout.setActions(littleSkinLink, cancelButton, acceptButton); } private Skin getSkin() { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/DialogPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/DialogPane.java index 0a2e9228d8..d0187baebf 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/DialogPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/DialogPane.java @@ -63,7 +63,7 @@ public DialogPane() { cancelButton.getStyleClass().add("dialog-cancel"); onEscPressed(this, cancelButton::fire); - setActions(warningLabel, acceptPane, cancelButton); + setActions(warningLabel, cancelButton, acceptPane); } protected JFXProgressBar getProgressBar() { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java index 8daab7bc5b..2562d2fcd9 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java @@ -66,7 +66,7 @@ public InputDialogPane(String text, String initialValue, FutureCallback JFXButton cancelButton = new JFXButton(i18n("button.cancel")); cancelButton.getStyleClass().add("dialog-cancel"); - this.setActions(lblCreationWarning, acceptPane, cancelButton); + this.setActions(lblCreationWarning, cancelButton, acceptButton); cancelButton.setOnAction(e -> fireEvent(new DialogCloseEvent())); acceptButton.setOnAction(e -> { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java index 3cf2f71351..6b18909ab5 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java @@ -201,14 +201,14 @@ public Builder addCancel(String cancelText, @Nullable Runnable cancel) { } public Builder yesOrNo(@Nullable Runnable yes, @Nullable Runnable no) { + addCancel(i18n("button.no"), no); + JFXButton btnYes = new JFXButton(i18n("button.yes")); btnYes.getStyleClass().add("dialog-accept"); if (yes != null) { btnYes.setOnAction(e -> yes.run()); } dialog.addButton(btnYes); - - addCancel(i18n("button.no"), no); return this; } 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 fca15907bd..e92e8cd497 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 @@ -83,7 +83,7 @@ public NBTEditorPage(Path file) throws IOException { cancelButton.setOnAction(e -> fireEvent(new PageCloseEvent())); onEscPressed(this, cancelButton::fire); - actions.getChildren().setAll(saveButton, cancelButton); + actions.getChildren().setAll(cancelButton, saveButton); Task.supplyAsync(() -> type.readAsTree(file)) .whenComplete(Schedulers.javafx(), (result, exception) -> { From 1ebdad652937ba9174f98bf0518fb327c3072619 Mon Sep 17 00:00:00 2001 From: Damon Lu <59256766+WhatDamon@users.noreply.github.com> Date: Fri, 16 Jan 2026 18:30:04 +0800 Subject: [PATCH 2/3] update --- .../src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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 709c95866b..0d05f6df0f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java @@ -116,12 +116,7 @@ public UpgradeDialog(RemoteVersion remoteVersion, Runnable updateRunnable) { cancelButton.getStyleClass().add("dialog-cancel"); cancelButton.setOnAction(e -> fireEvent(new DialogCloseEvent())); - Region spacer = new Region(); - HBox.setHgrow(spacer, Priority.ALWAYS); - - HBox hBox = new HBox(openInBrowser, spacer, cancelButton, updateButton); - - setActions(hBox); + setActions(openInBrowser, cancelButton, updateButton); onEscPressed(this, cancelButton::fire); } } From db4a13a994a7493dee24d0be4270daea2584908a Mon Sep 17 00:00:00 2001 From: Damon Lu <59256766+WhatDamon@users.noreply.github.com> Date: Fri, 16 Jan 2026 19:07:19 +0800 Subject: [PATCH 3/3] update --- HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java | 3 --- 1 file changed, 3 deletions(-) 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 0d05f6df0f..fadda1737d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java @@ -22,9 +22,6 @@ import com.jfoenix.controls.JFXSpinner; import javafx.scene.control.Label; import javafx.scene.control.ScrollPane; -import javafx.scene.layout.HBox; -import javafx.scene.layout.Priority; -import javafx.scene.layout.Region; import org.jackhuang.hmcl.Metadata; import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task;