From c60af8675fcd9c9a553073f68d1569022123df9b Mon Sep 17 00:00:00 2001 From: Wulian233 <1055917385@qq.com> Date: Sat, 4 Oct 2025 21:16:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=82=B9=E5=87=BB=E5=90=8E=E5=A7=8B=E7=BB=88=E4=BF=9D?= =?UTF-8?q?=E6=8C=81=E7=84=A6=E7=82=B9=E7=8A=B6=E6=80=81=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20(#4585)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jackhuang/hmcl/ui/ToolbarListPageSkin.java | 5 ++++- .../jackhuang/hmcl/ui/download/VersionsPage.java | 15 +++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ToolbarListPageSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/ToolbarListPageSkin.java index f4cb8c681..d7aeb10e9 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ToolbarListPageSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/ToolbarListPageSkin.java @@ -100,7 +100,10 @@ public abstract class ToolbarListPageSkin ret.getStyleClass().add("jfx-tool-bar-button"); ret.setGraphic(wrap(svg.createIcon(Theme.blackFill(), -1))); ret.setText(text); - ret.setOnAction(e -> onClick.run()); + ret.setOnAction(e -> { + onClick.run(); + ret.getScene().getRoot().requestFocus(); + }); return ret; } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java index ff5cabd19..2400ca0dd 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java @@ -19,7 +19,8 @@ package org.jackhuang.hmcl.ui.download; import com.jfoenix.controls.*; import javafx.beans.InvalidationListener; -import javafx.beans.property.*; +import javafx.beans.property.ObjectProperty; +import javafx.beans.property.SimpleObjectProperty; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.geometry.Insets; @@ -49,7 +50,10 @@ import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.SVG; import org.jackhuang.hmcl.ui.animation.ContainerAnimations; import org.jackhuang.hmcl.ui.animation.TransitionPane; -import org.jackhuang.hmcl.ui.construct.*; +import org.jackhuang.hmcl.ui.construct.ComponentList; +import org.jackhuang.hmcl.ui.construct.RipplerContainer; +import org.jackhuang.hmcl.ui.construct.SpinnerPane; +import org.jackhuang.hmcl.ui.construct.TwoLineListItem; import org.jackhuang.hmcl.ui.wizard.Navigation; import org.jackhuang.hmcl.ui.wizard.Refreshable; import org.jackhuang.hmcl.ui.wizard.WizardPage; @@ -65,8 +69,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import static org.jackhuang.hmcl.ui.FXUtils.*; -import static org.jackhuang.hmcl.util.logging.Logger.LOG; import static org.jackhuang.hmcl.util.i18n.I18n.i18n; +import static org.jackhuang.hmcl.util.logging.Logger.LOG; public final class VersionsPage extends Control implements WizardPage, Refreshable { private final String gameVersion; @@ -172,7 +176,10 @@ public final class VersionsPage extends Control implements WizardPage, Refreshab { if ("game".equals(control.libraryId)) { JFXButton wikiButton = newToggleButton4(SVG.GLOBE_BOOK); - wikiButton.setOnAction(event -> onOpenWiki()); + wikiButton.setOnAction(event -> { + onOpenWiki(); + wikiButton.getScene().getRoot().requestFocus(); + }); FXUtils.installFastTooltip(wikiButton, i18n("wiki.tooltip")); actions.getChildren().add(wikiButton); }