From ab12ebe967826f9c62fab56e111953c3cabda520 Mon Sep 17 00:00:00 2001
From: Flag <38012125+Yumiro@users.noreply.github.com>
Date: Thu, 6 Jul 2023 21:39:21 +0100
Subject: [PATCH] remove switch + add theme disclaimer

---
 src/main/mainWindow.ts               |  6 ++++--
 src/renderer/components/Settings.tsx | 22 ++++++++++------------
 src/shared/settings.d.ts             |  3 +--
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/main/mainWindow.ts b/src/main/mainWindow.ts
index 9a220b3..5550c6b 100644
--- a/src/main/mainWindow.ts
+++ b/src/main/mainWindow.ts
@@ -262,13 +262,15 @@ function createMainWindow() {
         },
         icon: ICON_PATH,
         frame: VencordSettings.store.frameless !== true,
-        ...(Settings.store.transparent
+        ...(Settings.store.transparencyOption !== "none"
             ? {
                   backgroundColor: "#00000000",
                   backgroundMaterial: Settings.store.transparencyOption,
                   transparent: true
               }
-            : {}),
+            : {
+                  transparent: false
+              }),
         ...(Settings.store.staticTitle ? { title: "Vencord" } : {}),
         ...(VencordSettings.store.macosTranslucency
             ? {
diff --git a/src/renderer/components/Settings.tsx b/src/renderer/components/Settings.tsx
index 583e58d..b5d8c3d 100644
--- a/src/renderer/components/Settings.tsx
+++ b/src/renderer/components/Settings.tsx
@@ -100,26 +100,25 @@ export default function SettingsUi() {
 
             {supportsWindowsTransparency && (
                 <>
-                    <Switch
-                        value={Settings.transparent ?? false}
-                        onChange={v => (Settings.transparent = v)}
-                        note="Requires a full restart"
-                    >
-                        Enable window transparency
-                    </Switch>
-
                     <Forms.FormTitle className={Margins.top16 + " " + Margins.bottom8}>
                         Transparency Options
                     </Forms.FormTitle>
+                    <Forms.FormText className={Margins.bottom8}>
+                        Requires a full restart. You will need a theme that supports transparency for this to work.
+                    </Forms.FormText>
 
                     <Select
-                        placeholder="Mica (incorporates system theme + desktop wallpaper to paint the background)"
+                        placeholder="None"
                         options={[
                             {
-                                label: "Mica (incorporates system theme + desktop wallpaper to paint the background)",
-                                value: "mica",
+                                label: "None",
+                                value: "none",
                                 default: true
                             },
+                            {
+                                label: "Mica (incorporates system theme + desktop wallpaper to paint the background)",
+                                value: "mica"
+                            },
                             { label: "Tabbed (variant of Mica with stronger background tinting)", value: "tabbed" },
                             {
                                 label: "Acrylic (blurs the window behind Vencord Desktop for a translucent background)",
@@ -130,7 +129,6 @@ export default function SettingsUi() {
                         select={v => (Settings.transparencyOption = v)}
                         isSelected={v => v === Settings.transparencyOption}
                         serialize={s => s}
-                        isDisabled={!Settings.transparent}
                     />
 
                     <Forms.FormDivider className={Margins.top16 + " " + Margins.bottom16} />
diff --git a/src/shared/settings.d.ts b/src/shared/settings.d.ts
index 843b001..2844b6b 100644
--- a/src/shared/settings.d.ts
+++ b/src/shared/settings.d.ts
@@ -7,8 +7,7 @@
 import type { Rectangle } from "electron";
 
 export interface Settings {
-    transparent?: boolean;
-    transparencyOption?: "mica" | "tabbed" | "acrylic";
+    transparencyOption?: "none" | "mica" | "tabbed" | "acrylic";
     maximized?: boolean;
     minimized?: boolean;
     windowBounds?: Rectangle;