From fd282267deb9fa830c4d2bb07a701c4440553fe2 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Mon, 13 May 2024 16:42:17 +0000
Subject: [PATCH] Attempt to center window

---
 app/src/main/java/io/xpipe/app/core/App.java  |  3 ---
 .../java/io/xpipe/app/core/AppMainWindow.java | 23 +++++++++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/core/App.java b/app/src/main/java/io/xpipe/app/core/App.java
index 1cd1257d..0fda4a58 100644
--- a/app/src/main/java/io/xpipe/app/core/App.java
+++ b/app/src/main/java/io/xpipe/app/core/App.java
@@ -55,9 +55,6 @@ public class App extends Application {
         appWindow.initialize();
         appWindow.setContent(content);
         TrackEvent.info("Application window initialized");
-        stage.setOnShown(event -> {
-            focus();
-        });
     }
 
     public void focus() {
diff --git a/app/src/main/java/io/xpipe/app/core/AppMainWindow.java b/app/src/main/java/io/xpipe/app/core/AppMainWindow.java
index 0efde7b6..0832aac1 100644
--- a/app/src/main/java/io/xpipe/app/core/AppMainWindow.java
+++ b/app/src/main/java/io/xpipe/app/core/AppMainWindow.java
@@ -1,6 +1,7 @@
 package io.xpipe.app.core;
 
 import io.xpipe.app.fxcomps.Comp;
+import io.xpipe.app.fxcomps.util.PlatformThread;
 import io.xpipe.app.issue.ErrorEvent;
 import io.xpipe.app.issue.TrackEvent;
 import io.xpipe.app.prefs.AppPrefs;
@@ -27,6 +28,7 @@ import java.nio.file.Path;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class AppMainWindow {
 
@@ -92,8 +94,7 @@ public class AppMainWindow {
                 .handle();
     }
 
-    private void initializeWindow() {
-        var state = loadState();
+    private void initializeWindow(WindowState state) {
         applyState(state);
 
         TrackEvent.withDebug("Window initialized")
@@ -106,7 +107,7 @@ public class AppMainWindow {
                 .handle();
     }
 
-    private void setupListeners() {
+    private void setupListeners(WindowState state) {
         stage.xProperty().addListener((c, o, n) -> {
             if (windowActive.get()) {
                 onChange();
@@ -141,6 +142,17 @@ public class AppMainWindow {
             windowActive.set(false);
         });
 
+        AtomicBoolean shown = new AtomicBoolean(false);
+        stage.setOnShown(event -> {
+            PlatformThread.runLaterIfNeeded(() -> {
+                if (state == null && !shown.get()) {
+                    stage.centerOnScreen();
+                }
+                stage.requestFocus();
+                shown.set(true);
+            });
+        });
+
         stage.setOnCloseRequest(e -> {
             if (!CloseBehaviourAlert.showIfNeeded()) {
                 e.consume();
@@ -237,8 +249,9 @@ public class AppMainWindow {
         stage.setMinWidth(550);
         stage.setMinHeight(400);
 
-        initializeWindow();
-        setupListeners();
+        var state = loadState();
+        initializeWindow(state);
+        setupListeners(state);
         windowActive.set(true);
         TrackEvent.debug("Window set to active");
     }