From d4e118f3311bac3fbbf94cc8c7a00ede8484a39e Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 28 Aug 2019 13:35:57 +0200 Subject: [PATCH] quit refinements --- .../java/org/cryptomator/ui/quit/QuitController.java | 3 +++ .../main/java/org/cryptomator/ui/quit/QuitModule.java | 2 +- main/ui/src/main/resources/fxml/quit.fxml | 10 ++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java index b68f2e556..7f6334eb2 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java @@ -83,6 +83,9 @@ public class QuitController implements FxController { return null; } }; + task.setOnScheduled(evt -> { + vault.setState(VaultState.PROCESSING); + }); task.setOnSucceeded(evt -> { vault.setState(VaultState.LOCKED); }); diff --git a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java index d48778df7..43b89ac54 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java @@ -37,7 +37,7 @@ abstract class QuitModule { static Stage provideStage(@Named("windowIcon") Optional windowIcon) { Stage stage = new Stage(); stage.setMinWidth(300); - stage.setMinHeight(200); + stage.setMinHeight(100); stage.initModality(Modality.APPLICATION_MODAL); windowIcon.ifPresent(stage.getIcons()::add); return stage; diff --git a/main/ui/src/main/resources/fxml/quit.fxml b/main/ui/src/main/resources/fxml/quit.fxml index 2631409f3..8915448ae 100644 --- a/main/ui/src/main/resources/fxml/quit.fxml +++ b/main/ui/src/main/resources/fxml/quit.fxml @@ -2,24 +2,22 @@ + - - - + - - - +