From 95da6eb9e2ac8dd1526ea88c9fa0f5f0b6e4cb89 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Wed, 4 Nov 2020 14:42:52 +0100 Subject: [PATCH] launcher: make modals closeable with esc key --- .../de/bixilon/minosoft/gui/main/MainWindow.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java b/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java index edb403d83..9d0a4e37e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/MainWindow.java @@ -29,6 +29,8 @@ import javafx.scene.Node; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.control.*; +import javafx.scene.input.KeyCode; +import javafx.scene.input.KeyEvent; import javafx.scene.layout.BorderPane; import javafx.scene.layout.GridPane; import javafx.stage.Modality; @@ -79,6 +81,11 @@ public class MainWindow implements Initializable { stage.close(); } }); + stage.addEventHandler(KeyEvent.KEY_PRESSED, (KeyEvent event) -> { + if (event.getCode() == KeyCode.ESCAPE) { + stage.close(); + } + }); stage.show(); } catch (IOException e) { e.printStackTrace(); @@ -195,6 +202,12 @@ public class MainWindow implements Initializable { stage.setTitle(LocaleManager.translate(Strings.SETTINGS_TITLE)); stage.getIcons().add(GUITools.logo); stage.setScene(new Scene(parent)); + stage.addEventHandler(KeyEvent.KEY_PRESSED, (KeyEvent event) -> { + if (event.getCode() == KeyCode.ESCAPE) { + stage.close(); + } + }); + stage.show(); } catch (IOException e) { e.printStackTrace();