Merge pull request slovensko-digital#160 from solver-it-sro/windows-iconified-fix

Remove nasty OS-handling, just disable focusing in main menu

Author: jsuchal

src/main/java/digital/slovensko/autogram/ui/gui/GUIApp.java

@@ -35,15 +35,10 @@ public void start(Stage windowStage) throws Exception {
             Platform.exit();
         });
 
-        if (params.isStandaloneMode()) {
-            GUIUtils.suppressDefaultFocus(windowStage, controller);
-        } else {
-            GUIUtils.setIconifiedWithSuppressingDefaultFocus(windowStage, controller);
-        }
-
+        if (!params.isStandaloneMode())
+            GUIUtils.startIconified(windowStage);
         windowStage.setTitle("Autogram");
         windowStage.setScene(scene);
-        windowStage.sizeToScene();
         windowStage.setResizable(false);
         windowStage.show();
     }

src/main/java/digital/slovensko/autogram/ui/gui/GUIUtils.java

@@ -52,21 +52,6 @@ static void showOnTop(Stage stage) {
         }).start();
     }
 
-    public static void setIconifiedWithSuppressingDefaultFocus(Stage windowStage, MainMenuController controller) {
-        // WARNING! DO NOT TOUCH!
-        // Windows behaves very differently.
-        // No focus event is fired for first time (!) iconified windowStage is opened/focused & it shows only empty window
-        if (OperatingSystem.current() == OperatingSystem.WINDOWS) {
-            windowStage.setOnShown(e -> GUIUtils.suppressDefaultFocus(windowStage, controller));
-
-            // do this only on windows since it flickers on Linux
-            windowStage.getIcons().add(new Image(Objects.requireNonNull(GUIApp.class.getResourceAsStream("Autogram.png"))));
-        } else {
-            GUIUtils.suppressDefaultFocus(windowStage, controller);
-        }
-        windowStage.setIconified(true);
-    }
-
     public static void suppressDefaultFocus(Stage stage, SuppressedFocusController controller) {
         stage.focusedProperty().addListener(((observable, old, isFocused) -> {
             if (isFocused) controller.getNodeForLoosingFocus().requestFocus(); // everything else looses focus
@@ -76,4 +61,17 @@ public static void suppressDefaultFocus(Stage stage, SuppressedFocusController c
     public static void closeWindow(Node node) {
         ((Stage) node.getScene().getWindow()).close();
     }
+
+    public static void startIconified(Stage stage) {
+        if (OperatingSystem.current() == OperatingSystem.LINUX) {
+            stage.setIconified(true);
+        } else {
+            // WINDOWS & MAC need to set iconified after showing primary stage, otherwise it starts blank
+            stage.setOpacity(0); // prevents startup blink
+            stage.setOnShown((e) -> Platform.runLater(() -> {
+                stage.setIconified(true);
+                stage.setOpacity(1);
+            }));
+        }
+    }
 }

src/main/resources/digital/slovensko/autogram/ui/gui/main-menu.fxml

@@ -19,7 +19,7 @@
             <VBox fx:id="dropZone" styleClass="autogram-dropzone">
                 <SVGPath styleClass="autogram-icon,autogram-icon--big" content="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m3.75 9v6m3-3H9m1.5-12H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z"/>
                 <TextFlow textAlignment="CENTER">
-                    <Button styleClass="autogram-button,autogram-button--secondary" fx:id="uploadButton" onAction="#onUploadButtonAction">Vyberte súbor</Button>
+                    <Button styleClass="autogram-button,autogram-button--secondary" focusTraversable="false" fx:id="uploadButton" onAction="#onUploadButtonAction">Vyberte súbor</Button>
                     <Text styleClass="autogram-body" text=" alebo ho presuňte sem" />
                 </TextFlow>
             </VBox>
@@ -28,7 +28,7 @@
     </top>
     <bottom>
         <HBox styleClass="autogram-footer">
-            <Button styleClass="autogram-link" onAction="#onAboutButtonAction">O Autograme</Button>
+            <Button styleClass="autogram-link" focusTraversable="false" onAction="#onAboutButtonAction">O Autograme</Button>
         </HBox>
     </bottom>
 </BorderPane>