Merge branch 'develop' into bugfix/comments_of_shortcut_in_background

Author: Death111

pom.xml

@@ -37,7 +37,7 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
 
-    <maven-dependency-check.version>5.1.0</maven-dependency-check.version>
+    <maven-dependency-check.version>5.2.1</maven-dependency-check.version>
     <!-- USING HTML,XML (comma-separated list) did not work with plugin version 5.1.0 -->
     <maven-dependency-check.format>ALL</maven-dependency-check.format>
     <maven-dependency-check.failOnError>true</maven-dependency-check.failOnError>
@@ -70,6 +70,7 @@
       <artifactId>flyway-core</artifactId>
     </dependency>
 
+    <!-- https://mvnrepository.com/artifact/com.1stleg/jnativehook -->
     <dependency>
       <groupId>com.1stleg</groupId>
       <artifactId>jnativehook</artifactId>

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();
       });
    }
-
 }