Merge branch 'develop' into feature/windowsAndDownToMinimize

Author: Death111

src/main/java/de/doubleslash/keeptime/view/ViewController.java

@@ -165,6 +165,7 @@ public void changeProject(final Project newProject, final long minusSeconds) {
       controller.changeProject(newProject, minusSeconds);
       updateProjectView();
       textArea.setText("");
+      textArea.requestFocus();
    }
 
    private final Map<Project, Label> elapsedProjectTimeLabelMap = new HashMap<>();
@@ -371,6 +372,7 @@ private void settingsClicked() {
    private void calendarClicked() {
       LOG.info("Calendar clicked");
       this.mainStage.setAlwaysOnTop(false);
+      reportStage.setAlwaysOnTop(true);
       reportController.update();
       reportStage.show();
    }
@@ -463,7 +465,10 @@ private void loadSubStages() {
          reportStage.setScene(reportScene);
          reportStage.setTitle("Report");
          reportStage.setResizable(false);
-         reportStage.setOnHiding(windowEvent -> this.mainStage.setAlwaysOnTop(true));
+         reportStage.setOnHiding(windowEvent -> {
+            reportStage.setAlwaysOnTop(false);
+            this.mainStage.setAlwaysOnTop(true);
+         });
 
          // Settings stage
          final FXMLLoader fxmlLoader2 = createFXMLLoader(RESOURCE.FXML_SETTINGS);
@@ -796,5 +801,4 @@ public void addNewProject(final ActionEvent ae) {
          realignProjectList();
       });
    }
-
 }

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

@@ -48,6 +48,7 @@ public class ViewControllerPopup {
 
    @FXML
    private TextField searchTextField;
+
    @FXML
    private ListView<Project> projectListView;
 
@@ -69,9 +70,10 @@ private void changeProject(final Project item) {
             "Add a note for '" + model.activeWorkItem.get().getProject().getName() + "' before changing project?");
       dialog.setContentText("Note: ");
 
-      this.stage.setAlwaysOnTop(false);
+      final Stage dialogStage = (Stage) dialog.getDialogPane().getScene().getWindow();
+      dialogStage.setAlwaysOnTop(true);
+
       final Optional<String> result = dialog.showAndWait();
-      this.stage.setAlwaysOnTop(true);
 
       result.ifPresent(note -> {
          controller.setComment(note);