From 8a762e70d9384f35cb574065018564bf690c77e6 Mon Sep 17 00:00:00 2001
From: Luka Leer <luka.leer@gmail.com>
Date: Tue, 2 Jan 2024 23:34:26 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Add=20ability=20to=20use=20native?=
 =?UTF-8?q?=20OS=20frame?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Luka Leer <luka.leer@gmail.com>
---
 assets/locales/en-us.json             |  6 ++++-
 injector/src/modules/browserwindow.js | 11 +++++++--
 renderer/src/builtins/builtins.js     |  1 +
 renderer/src/builtins/window/frame.js | 33 +++++++++++++++++++++++++++
 renderer/src/data/settings.js         |  4 ++--
 5 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 renderer/src/builtins/window/frame.js

diff --git a/assets/locales/en-us.json b/assets/locales/en-us.json
index c3c30397..63128c4b 100644
--- a/assets/locales/en-us.json
+++ b/assets/locales/en-us.json
@@ -39,7 +39,7 @@
                 },
                 "frame": {
                     "name": "Window Frame",
-                    "note": "Adds the native os window frame to the main window"
+                    "note": "Adds the native OS window frame to the main window (requires restart)"
                 }
             },
             "addons": {
@@ -237,6 +237,10 @@
         "enabledInfo": "This option requires a transparent theme in order to work properly. On Windows this may break your aero snapping and maximizing.\n\nIn order to take effect, Discord needs to be restarted. Do you want to restart now?",
         "disabledInfo": "In order to take effect, Discord needs to be restarted. Do you want to restart now?"
     },
+    "NativeFrame": {
+        "enabledInfo": "In order to take effect, Discord needs to be restarted. Do you want to restart now?",
+        "disabledInfo": "In order to take effect, Discord needs to be restarted. Do you want to restart now?"
+    },
     "Notices": {
         "moreInfo": "More Info"
     },
diff --git a/injector/src/modules/browserwindow.js b/injector/src/modules/browserwindow.js
index 7dd207d4..a6dd9bcb 100644
--- a/injector/src/modules/browserwindow.js
+++ b/injector/src/modules/browserwindow.js
@@ -17,10 +17,17 @@ class BrowserWindow extends electron.BrowserWindow {
         }
 
         // Only affect frame if it is *explicitly* set
-        // const shouldHaveFrame = BetterDiscord.getSetting("window", "frame");
-        // if (typeof(shouldHaveFrame) === "boolean") options.frame = shouldHaveFrame;
+        const shouldHaveFrame = BetterDiscord.getSetting("window", "frame");
+        if (typeof(shouldHaveFrame) === "boolean") options.frame = shouldHaveFrame;
 
         super(options);
+
+        if (typeof(shouldHaveFrame) === "boolean" && shouldHaveFrame) {
+            this.webContents.insertCSS(`div[class*="titleBar_"] {
+                display: none !important;
+            }`);
+        }
+
         this.__originalPreload = originalPreload;
         BetterDiscord.setup(this);
     }
diff --git a/renderer/src/builtins/builtins.js b/renderer/src/builtins/builtins.js
index bcbebef5..e86d51ee 100644
--- a/renderer/src/builtins/builtins.js
+++ b/renderer/src/builtins/builtins.js
@@ -18,4 +18,5 @@ export {default as StopDevToolsWarning} from "./developer/devtoolswarning";
 export {default as DebugLogs} from "./developer/debuglogs";
 
 export {default as WindowPrefs} from "./window/transparency";
+export {default as NativeFrame} from "./window/frame";
 export {default as RemoveMinimumSize} from "./window/removeminimumsize";
\ No newline at end of file
diff --git a/renderer/src/builtins/window/frame.js b/renderer/src/builtins/window/frame.js
new file mode 100644
index 00000000..0dff6c7e
--- /dev/null
+++ b/renderer/src/builtins/window/frame.js
@@ -0,0 +1,33 @@
+import Builtin from "@structs/builtin";
+
+import Strings from "@modules/strings";
+import IPC from "@modules/ipc";
+
+import Modals from "@ui/modals";
+
+
+export default new class NativeFrame extends Builtin {
+    get name() {return "NativeFrame";}
+    get category() {return "window";}
+    get id() {return "frame";}
+
+    enabled() {
+        this.showModal(Strings.NativeFrame.enabledInfo);
+        document.body.classList.add("bd-frame");
+    }
+
+    disabled() {
+        this.showModal(Strings.NativeFrame.disabledInfo);
+        document.body.classList.remove("bd-frame");
+    }
+
+    showModal(info) {
+        if (!this.initialized) return;
+        Modals.showConfirmationModal(Strings.Modals.additionalInfo, info, {
+            confirmText: Strings.Modals.restartNow,
+            cancelText: Strings.Modals.restartLater,
+            danger: true,
+            onConfirm: () => IPC.relaunch()
+        });
+    }
+};
\ No newline at end of file
diff --git a/renderer/src/data/settings.js b/renderer/src/data/settings.js
index 96a1dfdc..b04b5fb7 100644
--- a/renderer/src/data/settings.js
+++ b/renderer/src/data/settings.js
@@ -52,8 +52,8 @@ export default [
         shown: false,
         settings: [
             {type: "switch", id: "transparency", value: false},
-            {type: "switch", id: "removeMinimumSize", value: false},
-            {type: "switch", id: "frame", value: false, hidden: true}
+            {type: "switch", id: "frame", value: false},
+            {type: "switch", id: "removeMinimumSize", value: false}
         ]
     },
     {