From 07a02c8c82e310e61e6246fd204204da49ceabbc Mon Sep 17 00:00:00 2001
From: JellyBrick <shlee1503@naver.com>
Date: Sun, 8 Oct 2023 17:05:54 +0900
Subject: [PATCH 1/2] Revert "hotfix: fixed app launching offscreen"

This reverts commit ca92031e8966ed8510e39d8f799c868df75e30c9.
---
 index.ts | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/index.ts b/index.ts
index 64149126..dbb7835b 100644
--- a/index.ts
+++ b/index.ts
@@ -225,16 +225,6 @@ function createMainWindow() {
   });
   loadPlugins(win);
 
-  const scaleFactor = screen.getAllDisplays().length > 1 ? screen.getPrimaryDisplay().scaleFactor : 1;
-
-  if (windowSize) {
-    const scaledSize = {
-      width: windowSize.width / scaleFactor,
-      height: windowSize.height / scaleFactor,
-    };
-    win.setSize(scaledSize.width, scaledSize.height);
-  }
-
   if (windowPosition) {
     const { x: windowX, y: windowY } = windowPosition;
     const winSize = win.getSize();
@@ -253,11 +243,7 @@ function createMainWindow() {
         );
       }
     } else {
-      const scaledPosition = {
-        x: windowX / scaleFactor,
-        y: windowY / scaleFactor,
-      };
-      win.setPosition(scaledPosition.x, scaledPosition.y);
+      win.setPosition(windowX, windowY);
     }
   }
 
@@ -275,6 +261,26 @@ function createMainWindow() {
   win.webContents.loadURL(urlToLoad);
   win.on('closed', onClosed);
 
+  const scaleFactor = screen.getAllDisplays().length > 1 ? screen.getPrimaryDisplay().scaleFactor : 1;
+  const size = config.get('window-size');
+  const position = config.get('window-position');
+
+  if (size && size.width && size.height) {
+    const scaledSize = {
+      width: size.width / scaleFactor,
+      height: size.height / scaleFactor,
+    };
+    win.setSize(scaledSize.width, scaledSize.height);
+  }
+
+  if (position && position.x && position.y) {
+    const scaledPosition = {
+      x: position.x / scaleFactor,
+      y: position.y / scaleFactor,
+    };
+    win.setPosition(scaledPosition.x, scaledPosition.y);
+  }
+
   type PiPOptions = typeof config.defaultConfig.plugins['picture-in-picture'];
   const setPiPOptions = config.plugins.isEnabled('picture-in-picture')
     // eslint-disable-next-line @typescript-eslint/no-var-requires

From 59ed2326d9b32049502d0626088fd2d2e611c576 Mon Sep 17 00:00:00 2001
From: JellyBrick <shlee1503@naver.com>
Date: Sun, 8 Oct 2023 17:06:30 +0900
Subject: [PATCH 2/2] Revert "Fix for windows zoom (ScaleFactor) #1159"

This reverts commit d36fb592d0ad12152e2d46429bbb8bb13519e63e.
---
 index.ts | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/index.ts b/index.ts
index dbb7835b..70db77af 100644
--- a/index.ts
+++ b/index.ts
@@ -261,26 +261,6 @@ function createMainWindow() {
   win.webContents.loadURL(urlToLoad);
   win.on('closed', onClosed);
 
-  const scaleFactor = screen.getAllDisplays().length > 1 ? screen.getPrimaryDisplay().scaleFactor : 1;
-  const size = config.get('window-size');
-  const position = config.get('window-position');
-
-  if (size && size.width && size.height) {
-    const scaledSize = {
-      width: size.width / scaleFactor,
-      height: size.height / scaleFactor,
-    };
-    win.setSize(scaledSize.width, scaledSize.height);
-  }
-
-  if (position && position.x && position.y) {
-    const scaledPosition = {
-      x: position.x / scaleFactor,
-      y: position.y / scaleFactor,
-    };
-    win.setPosition(scaledPosition.x, scaledPosition.y);
-  }
-
   type PiPOptions = typeof config.defaultConfig.plugins['picture-in-picture'];
   const setPiPOptions = config.plugins.isEnabled('picture-in-picture')
     // eslint-disable-next-line @typescript-eslint/no-var-requires