From 5f047983ec4232d3958478a2bbc9156eb9292df5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20=C3=85berg?= <anders@andersaberg.com>
Date: Thu, 27 Feb 2025 20:01:41 +0100
Subject: [PATCH] adress position feedback

---
 .../src/platform/popup-modal-styles.ts        | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/apps/desktop/src/platform/popup-modal-styles.ts b/apps/desktop/src/platform/popup-modal-styles.ts
index e33c41f09b4..f71bd35c82b 100644
--- a/apps/desktop/src/platform/popup-modal-styles.ts
+++ b/apps/desktop/src/platform/popup-modal-styles.ts
@@ -9,14 +9,6 @@ const popupHeight = 500;
 export function applyPopupModalStyles(window: BrowserWindow, position?: [number, number]) {
   window.unmaximize();
   window.setSize(popupWidth, popupHeight);
-
-  if (position) {
-    const centeredX = position[0] - popupWidth / 2;
-    const centeredY = position[1] - popupHeight / 2;
-    window.setPosition(centeredX, centeredY);
-  } else {
-    window.center();
-  }
   window.setWindowButtonVisibility?.(false);
   window.setMenuBarVisibility?.(false);
   window.setResizable(false);
@@ -27,15 +19,21 @@ export function applyPopupModalStyles(window: BrowserWindow, position?: [number,
     window.setFullScreen(false);
     window.once("leave-full-screen", () => {
       window.setSize(popupWidth, popupHeight);
-      window.center();
-      if (position) {
-        const centeredX = position[0] - popupWidth / 2;
-        const centeredY = position[1] - popupHeight / 2;
-        window.setPosition(centeredX, centeredY);
-      } else {
-        window.center();
-      }
+      positionWindow(window, position);
     });
+  } else {
+    // If not in full screen
+    positionWindow(window, position);
+  }
+}
+
+function positionWindow(window: BrowserWindow, position?: [number, number]) {
+  if (position) {
+    const centeredX = position[0] - popupWidth / 2;
+    const centeredY = position[1] - popupHeight / 2;
+    window.setPosition(centeredX, centeredY);
+  } else {
+    window.center();
   }
 }