Skip to content

Commit ffbbde9

Browse files
Fix #5037 #5307: 修复部分列表点击后无法通过 esc 返回的问题 (#5375)
1 parent c75bcd9 commit ffbbde9

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

HMCL/src/main/java/org/jackhuang/hmcl/ui/ToolbarListPageSkin.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import javafx.scene.Node;
2626
import javafx.scene.control.ListCell;
2727
import javafx.scene.control.SkinBase;
28+
import javafx.scene.input.KeyCode;
29+
import javafx.scene.input.KeyEvent;
2830
import javafx.scene.layout.HBox;
2931
import javafx.scene.layout.Priority;
3032
import javafx.scene.layout.StackPane;
@@ -65,6 +67,7 @@ public ToolbarListPageSkin(P skinnable) {
6567
this.listView.setCellFactory(listView -> createListCell((JFXListView<E>) listView));
6668
ComponentList.setVgrow(listView, Priority.ALWAYS);
6769
Bindings.bindContent(this.listView.getItems(), skinnable.itemsProperty());
70+
FXUtils.ignoreEvent(listView, KeyEvent.KEY_PRESSED, e -> e.getCode() == KeyCode.ESCAPE);
6871
root.getContent().add(listView);
6972
}
7073

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ResourcepackListPage.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import javafx.scene.control.SkinBase;
1010
import javafx.scene.image.Image;
1111
import javafx.scene.image.ImageView;
12+
import javafx.scene.input.KeyCode;
13+
import javafx.scene.input.KeyEvent;
1214
import javafx.scene.layout.BorderPane;
1315
import javafx.scene.layout.HBox;
1416
import javafx.scene.layout.Priority;
@@ -140,6 +142,8 @@ private ResourcepackListPageSkin(ResourcepackListPage control) {
140142
root.getStyleClass().add("no-padding");
141143
listView = new JFXListView<>();
142144

145+
FXUtils.ignoreEvent(listView, KeyEvent.KEY_PRESSED, e -> e.getCode() == KeyCode.ESCAPE);
146+
143147
HBox toolbar = new HBox();
144148
toolbar.setAlignment(Pos.CENTER_LEFT);
145149
toolbar.setPickOnBounds(false);

0 commit comments

Comments
 (0)