#32 setting dialog on top without knowledge of other stage

Author: Death111

src/main/java/de/doubleslash/keeptime/Main.java

@@ -221,7 +221,6 @@ private void initialisePopupUI(final Stage primaryStage) throws IOException {
       // Give the controller access to the main app.
       popupViewStage.setAlwaysOnTop(true);
       final ViewControllerPopup viewControllerPopupController = loader.getController();
-      viewControllerPopupController.setMainStage(primaryStage);
       viewControllerPopupController.setStage(popupViewStage);
       viewControllerPopupController.setControllerAndModel(controller, model);
       globalScreenListener.setViewController(viewControllerPopupController);

src/main/java/de/doubleslash/keeptime/viewpopup/ViewControllerPopup.java

@@ -48,22 +48,18 @@ public class ViewControllerPopup {
 
    @FXML
    private TextField searchTextField;
+
    @FXML
    private ListView<Project> projectListView;
 
    private Stage stage;
-   private Stage mainStage;
 
    private Controller controller;
 
    private Model model;
 
    private FilteredList<Project> filteredData;
 
-   public void setMainStage(final Stage mainStage) {
-      this.mainStage = mainStage;
-   }
-
    private void changeProject(final Project item) {
       LOG.info("Change project to '{}'.", item.getName());
 
@@ -74,11 +70,10 @@ private void changeProject(final Project item) {
             "Add a note for '" + model.activeWorkItem.get().getProject().getName() + "' before changing project?");
       dialog.setContentText("Note: ");
 
-      mainStage.setAlwaysOnTop(false);
-      this.stage.setAlwaysOnTop(true);
+      final Stage dialogStage = (Stage) dialog.getDialogPane().getScene().getWindow();
+      dialogStage.setAlwaysOnTop(true);
+
       final Optional<String> result = dialog.showAndWait();
-      this.stage.setAlwaysOnTop(false);
-      mainStage.setAlwaysOnTop(true);
 
       result.ifPresent(note -> {
          controller.setComment(note);