From 46a2314173db82d2c5882f0bd06345839874d334 Mon Sep 17 00:00:00 2001
From: AAGaming <aagaming00@protonmail.com>
Date: Tue, 24 Oct 2023 18:24:37 -0400
Subject: [PATCH] fix turnary soup in main window options (#164)

---
 .gitignore             |  1 +
 src/main/mainWindow.ts | 57 ++++++++++++++++++++++++------------------
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 94c1776..be8fd61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ node_modules
 .env
 .DS_Store
 .idea/
+.pnpm-store/
\ No newline at end of file
diff --git a/src/main/mainWindow.ts b/src/main/mainWindow.ts
index 231b457..829ae4b 100644
--- a/src/main/mainWindow.ts
+++ b/src/main/mainWindow.ts
@@ -278,6 +278,28 @@ function getWindowBoundsOptions(): BrowserWindowConstructorOptions {
     return options;
 }
 
+function getDarwinOptions(): BrowserWindowConstructorOptions {
+    const options = {
+        titleBarStyle: "hiddenInset"
+    } as BrowserWindowConstructorOptions;
+
+    const { splashTheming, splashBackground } = Settings.store;
+    const { macosTranslucency } = VencordSettings.store;
+
+    if (macosTranslucency) {
+        options.vibrancy = "sidebar";
+        options.backgroundColor = "#ffffff00";
+    } else {
+        if (splashTheming) {
+            options.backgroundColor = splashBackground;
+        } else {
+            options.backgroundColor = nativeTheme.shouldUseDarkColors ? "#313338" : "#ffffff";
+        }
+    }
+
+    return options;
+}
+
 function initWindowBoundsListeners(win: BrowserWindow) {
     const saveState = () => {
         Settings.store.maximized = win.isMaximized();
@@ -342,10 +364,9 @@ function createMainWindow() {
     removeSettingsListeners();
     removeVencordSettingsListeners();
 
-    const { staticTitle, transparencyOption, splashTheming, splashBackground, enableMenu, discordWindowsTitleBar } =
-        Settings.store;
+    const { staticTitle, transparencyOption, enableMenu, discordWindowsTitleBar } = Settings.store;
 
-    const { frameless, macosTranslucency } = VencordSettings.store;
+    const { frameless } = VencordSettings.store;
 
     const noFrame = frameless === true || (process.platform === "win32" && discordWindowsTitleBar === true);
 
@@ -361,28 +382,14 @@ function createMainWindow() {
         },
         icon: ICON_PATH,
         frame: !noFrame,
-        ...(transparencyOption && transparencyOption !== "none"
-            ? {
-                  backgroundColor: "#00000000",
-                  backgroundMaterial: transparencyOption,
-                  transparent: true
-              }
-            : {}),
-        ...(staticTitle ? { title: "Vesktop" } : {}),
-        ...(macosTranslucency
-            ? {
-                  vibrancy: "sidebar",
-                  backgroundColor: "#ffffff00"
-              }
-            : {
-                  backgroundColor: splashTheming
-                      ? splashBackground
-                      : nativeTheme.shouldUseDarkColors
-                      ? "#313338"
-                      : "#ffffff",
-                  transparent: false
-              }),
-        ...(process.platform === "darwin" ? { titleBarStyle: "hiddenInset" } : {}),
+        ...(transparencyOption &&
+            transparencyOption !== "none" && {
+                backgroundColor: "#00000000",
+                backgroundMaterial: transparencyOption,
+                transparent: true
+            }),
+        ...(staticTitle && { title: "Vesktop" }),
+        ...(process.platform === "darwin" && getDarwinOptions()),
         ...getWindowBoundsOptions(),
         autoHideMenuBar: enableMenu
     }));