From b6a4f70ec9512821bc2135f6b449d0e5182eb88b Mon Sep 17 00:00:00 2001 From: En-Jan Chou Date: Tue, 14 Jan 2020 16:39:00 -0500 Subject: [PATCH 1/2] Handle close request event for main window When receiving close request event, main window should quit program if there is no system tray available, and just like the close button was clicked. The window close request event happens when user close window by pressing alt-f4 (Gnome) or when receiving WM_DELETE_WINDOW xwindow event. Current behavior is just close the window and let the program keep running, and there is no way to quit program without system tray. --- .../cryptomator/ui/mainwindow/MainWindowTitleController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java index 573a835ff..2d08f5d19 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java @@ -57,6 +57,9 @@ public class MainWindowTitleController implements FxController { window.setX(event.getScreenX() - xOffset); window.setY(event.getScreenY() - yOffset); }); + window.setOnCloseRequest(event -> { + close(); + }); } @FXML From 1ec9b0507de1d6ba1060c2df6482f3dc5cfea9f6 Mon Sep 17 00:00:00 2001 From: En-Jan Chou Date: Tue, 14 Jan 2020 17:12:36 -0500 Subject: [PATCH 2/2] Prevent window close if user choose cancel in quit window --- .../org/cryptomator/ui/mainwindow/MainWindowTitleController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java index 2d08f5d19..53044e00a 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java @@ -59,6 +59,7 @@ public class MainWindowTitleController implements FxController { }); window.setOnCloseRequest(event -> { close(); + event.consume(); }); }