From a77ef95ce4d4c516adf9f9bbdd80ed6b2e9c298c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=9E=E5=BA=90?= <109708109+CiiLu@users.noreply.github.com> Date: Mon, 22 Dec 2025 21:56:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=20`FXUtils#onClicked`=20?= =?UTF-8?q?=E7=9A=84=E8=BF=9E=E7=82=B9=E9=99=90=E5=88=B6=20(#4882)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java | 2 +- .../jackhuang/hmcl/ui/construct/OptionToggleButton.java | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java index c92acf202..c7621d137 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java @@ -1364,7 +1364,7 @@ public final class FXUtils { public static void onClicked(Node node, Runnable action) { node.addEventHandler(MouseEvent.MOUSE_CLICKED, e -> { - if (e.getButton() == MouseButton.PRIMARY && e.getClickCount() == 1) { + if (e.getButton() == MouseButton.PRIMARY) { action.run(); e.consume(); } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/OptionToggleButton.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/OptionToggleButton.java index a03a828d9..55362ce0e 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/OptionToggleButton.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/OptionToggleButton.java @@ -25,8 +25,6 @@ import javafx.beans.property.StringProperty; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.control.Label; -import javafx.scene.input.MouseButton; -import javafx.scene.input.MouseEvent; import javafx.scene.layout.BorderPane; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; @@ -64,12 +62,7 @@ public class OptionToggleButton extends StackPane { toggleButton.setSize(8); FXUtils.setLimitHeight(toggleButton, 30); - container.addEventHandler(MouseEvent.MOUSE_CLICKED, e -> { - if (e.getButton() == MouseButton.PRIMARY) { - toggleButton.setSelected(!toggleButton.isSelected()); - e.consume(); - } - }); + FXUtils.onClicked(container, () -> toggleButton.setSelected(!toggleButton.isSelected())); FXUtils.onChangeAndOperate(subtitleProperty(), subtitle -> { if (StringUtils.isNotBlank(subtitle)) {