From ffbbde9d8f61a33fe84b391fbaeb0db186f54df3 Mon Sep 17 00:00:00 2001
From: NoClassDefFoundError <rnmddos@163.com>
Date: Sun, 1 Feb 2026 16:22:26 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20#5037=20#5307:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=88=97=E8=A1=A8=E7=82=B9=E5=87=BB=E5=90=8E?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87=20esc=20=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20(#5375)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/jackhuang/hmcl/ui/ToolbarListPageSkin.java  | 3 +++
 .../org/jackhuang/hmcl/ui/versions/ResourcepackListPage.java  | 4 ++++
 2 files changed, 7 insertions(+)

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 b96c99ade..0e9ecb026 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ToolbarListPageSkin.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/ToolbarListPageSkin.java
@@ -25,6 +25,8 @@ import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.SkinBase;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.StackPane;
@@ -65,6 +67,7 @@ public abstract class ToolbarListPageSkin<E, P extends ListPageBase<E>> extends
             this.listView.setCellFactory(listView -> createListCell((JFXListView<E>) listView));
             ComponentList.setVgrow(listView, Priority.ALWAYS);
             Bindings.bindContent(this.listView.getItems(), skinnable.itemsProperty());
+            FXUtils.ignoreEvent(listView, KeyEvent.KEY_PRESSED, e -> e.getCode() == KeyCode.ESCAPE);
             root.getContent().add(listView);
         }
 
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ResourcepackListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ResourcepackListPage.java
index bd2b1da00..9c1a9be2c 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ResourcepackListPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ResourcepackListPage.java
@@ -9,6 +9,8 @@ import javafx.scene.control.Skin;
 import javafx.scene.control.SkinBase;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
@@ -140,6 +142,8 @@ public final class ResourcepackListPage extends ListPageBase<ResourcepackListPag
             root.getStyleClass().add("no-padding");
             listView = new JFXListView<>();
 
+            FXUtils.ignoreEvent(listView, KeyEvent.KEY_PRESSED, e -> e.getCode() == KeyCode.ESCAPE);
+
             HBox toolbar = new HBox();
             toolbar.setAlignment(Pos.CENTER_LEFT);
             toolbar.setPickOnBounds(false);