fix lint

src/main/utils/mergeDefaults.ts

@@ -13,7 +13,7 @@
 export function mergeDefaults<T>(obj: T, defaults: T): T {
     for (const key in defaults) {
         const v = defaults[key];
-        if (typeof v === "object" && !Array.isArray(v)) {
+        if (typeof v === "object" && !Array.isArray(v) && v !== null) {
             obj[key] ??= {} as any;
             mergeDefaults(obj[key], v);
         } else {

src/main/utils/popout.ts

@@ -37,7 +37,7 @@ const DEFAULT_POPOUT_OPTIONS: BrowserWindowConstructorOptions = {
     backgroundColor: "#2f3136",
     minWidth: MIN_POPOUT_WIDTH,
     minHeight: MIN_POPOUT_HEIGHT,
-    frame: Settings.store.customTitleBar !== true,
+    frame: Settings.store.nativeTitleBar,
     titleBarStyle: process.platform === "darwin" ? "hidden" : undefined,
     trafficLightPosition:
         process.platform === "darwin"

src/renderer/components/settings/Settings.tsx

@@ -66,19 +66,19 @@ const SettingsOptions: Record<string, Array<BooleanSetting | SettingsComponent>>
             key: "enableMenu",
             title: "Enable Menu Bar",
             description: "Enables the application menu bar. Press ALT to toggle visibility.",
-            disabled: () => Settings.store.nativeTitleBar !== true
+            disabled: () => !Settings.store.nativeTitleBar
         },
         {
             key: "enableShadow",
             title: "Enable Window Shadow",
             description: "Enables the window shadow. Requires a full restart.",
-            disabled: () => Settings.store.nativeTitleBar === true
+            disabled: () => Settings.store.nativeTitleBar
         },
         {
             key: "enableRoundedCorners",
             title: "Enable Rounded Corners",
             description: "Enables rounded corners. Requires a full restart.",
-            disabled: () => Settings.store.nativeTitleBar === true
+            disabled: () => Settings.store.nativeTitleBar
         },
         {
             key: "enableSplashScreen",

src/renderer/patches/platformClass.tsx

@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { Settings } from "renderer/settings";
 import { isMac } from "renderer/utils";
 
 import { addPatch } from "./shared";
@@ -21,7 +20,6 @@ addPatch({
     ],
 
     getPlatformClass() {
-        if (Settings.store.customTitleBar) return "platform-win";
         if (isMac) return "platform-osx";
         return "platform-web";
     }

src/renderer/patches/windowsTitleBar.tsx

@@ -8,7 +8,7 @@ import { Settings } from "renderer/settings";
 
 import { addPatch } from "./shared";
 
-if (Settings.store.customTitleBar)
+if (!Settings.store.nativeTitleBar)
     addPatch({
         patches: [
             {