diff --git a/main/ui/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java index ea855e67f..464671929 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java +++ b/main/ui/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java @@ -106,6 +106,13 @@ public class MasterkeyFileLoadingStrategy implements KeyLoadingStrategy { Platform.runLater(() -> { window.setScene(selectMasterkeyFileScene.get()); window.show(); + Window owner = window.getOwner(); + if (owner != null) { + window.setX(owner.getX() + (owner.getWidth() - window.getWidth()) / 2); + window.setY(owner.getY() + (owner.getHeight() - window.getHeight()) / 2); + } else { + window.centerOnScreen(); + } }); return masterkeyFileProvisionLock.awaitInteraction(); } @@ -126,6 +133,13 @@ public class MasterkeyFileLoadingStrategy implements KeyLoadingStrategy { Platform.runLater(() -> { window.setScene(passphraseEntryScene.get()); window.show(); + Window owner = window.getOwner(); + if (owner != null) { + window.setX(owner.getX() + (owner.getWidth() - window.getWidth()) / 2); + window.setY(owner.getY() + (owner.getHeight() - window.getHeight()) / 2); + } else { + window.centerOnScreen(); + } if (wrongPassword) { Animations.createShakeWindowAnimation(window).play(); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java b/main/ui/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java index 89cbf1657..d4356be85 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java @@ -34,7 +34,6 @@ import javafx.scene.image.ImageView; import javafx.scene.transform.Rotate; import javafx.scene.transform.Translate; import javafx.stage.Stage; -import javafx.stage.Window; import javafx.stage.WindowEvent; import javafx.util.Duration; import java.util.Arrays; @@ -88,14 +87,6 @@ public class PassphraseEntryController implements FxController { @FXML public void initialize() { - Window owner = window.getOwner(); - if (owner != null) { - window.setX(owner.getX() + (owner.getWidth() - window.getWidth()) / 2); - window.setY(owner.getY() + (owner.getHeight() - window.getHeight()) / 2); - } else { - window.centerOnScreen(); - } - savePasswordCheckbox.setSelected(savedPassword.isPresent()); if (password.get() != null) { passwordField.setPassword(password.get()); diff --git a/main/ui/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/SelectMasterkeyFileController.java b/main/ui/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/SelectMasterkeyFileController.java index ff33070b3..39be2b36e 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/SelectMasterkeyFileController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/SelectMasterkeyFileController.java @@ -12,7 +12,6 @@ import javax.inject.Inject; import javafx.fxml.FXML; import javafx.stage.FileChooser; import javafx.stage.Stage; -import javafx.stage.Window; import javafx.stage.WindowEvent; import java.io.File; import java.nio.file.Path; @@ -38,16 +37,6 @@ public class SelectMasterkeyFileController implements FxController { this.window.setOnHiding(this::windowClosed); } - public void initialize() { - Window owner = window.getOwner(); - if (owner != null) { - window.setX(owner.getX() + (owner.getWidth() - window.getWidth()) / 2); - window.setY(owner.getY() + (owner.getHeight() - window.getHeight()) / 2); - } else { - window.centerOnScreen(); - } - } - @FXML public void cancel() { window.close();