From 27a0239d8e4282dc0abb08e14ca97db660408747 Mon Sep 17 00:00:00 2001
From: Finesssee <90105158+Finesssee@users.noreply.github.com>
Date: Wed, 11 Mar 2026 03:00:20 +0700
Subject: [PATCH 1/2] Fix compact menu overlay in compact mode

---
 src/features/window/custom-title-bar.tsx | 50 ++++++++++++++++++------
 src/features/window/menu-bar/index.tsx   |  7 +++-
 2 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/features/window/custom-title-bar.tsx b/src/features/window/custom-title-bar.tsx
index ed4d96fc..d2d2cd25 100644
--- a/src/features/window/custom-title-bar.tsx
+++ b/src/features/window/custom-title-bar.tsx
@@ -152,9 +152,28 @@ const CustomTitleBar = ({ showMinimal = false }: CustomTitleBarProps) => {
       >
         {/* Left side: keep clear of traffic lights */}
         <div className="pointer-events-auto flex min-w-0 items-center gap-2">
-          {!settings.nativeMenuBar && (
+          {!settings.nativeMenuBar && !settings.compactMenuBar && (
             <CustomMenuBar activeMenu={menuBarActiveMenu} setActiveMenu={setMenuBarActiveMenu} />
           )}
+          {!settings.nativeMenuBar && settings.compactMenuBar && (
+            <div className="relative">
+              <Tooltip content="Menu" side="bottom">
+                <button
+                  onClick={() => {
+                    setMenuBarActiveMenu("File");
+                  }}
+                  className="flex h-6 w-8 items-center justify-center rounded-full border border-border bg-primary-bg/70 py-0.5 text-text-lighter transition-colors hover:bg-hover hover:text-text"
+                >
+                  <MenuIcon size={16} />
+                </button>
+              </Tooltip>
+              <CustomMenuBar
+                activeMenu={menuBarActiveMenu}
+                setActiveMenu={setMenuBarActiveMenu}
+                compactFloating
+              />
+            </div>
+          )}
           <SidebarPaneSelector
             isGitViewActive={isGitViewActive}
             isGitHubPRsViewActive={isGitHubPRsViewActive}
@@ -186,22 +205,29 @@ const CustomTitleBar = ({ showMinimal = false }: CustomTitleBarProps) => {
     >
       {/* Left side */}
       <div data-tauri-drag-region className="flex flex-1 items-center px-1">
-        {!settings.nativeMenuBar && (
+        {!settings.nativeMenuBar && !settings.compactMenuBar && (
           <CustomMenuBar activeMenu={menuBarActiveMenu} setActiveMenu={setMenuBarActiveMenu} />
         )}
 
         {/* Menu bar button */}
         {!settings.nativeMenuBar && settings.compactMenuBar && (
-          <Tooltip content="Menu" side="bottom">
-            <button
-              onClick={() => {
-                setMenuBarActiveMenu("File");
-              }}
-              className="mr-2 flex h-6 w-8 items-center justify-center rounded-full border border-border bg-primary-bg/70 py-0.5 text-text-lighter transition-colors hover:bg-hover hover:text-text"
-            >
-              <MenuIcon size={16} />
-            </button>
-          </Tooltip>
+          <div className="relative mr-2">
+            <Tooltip content="Menu" side="bottom">
+              <button
+                onClick={() => {
+                  setMenuBarActiveMenu("File");
+                }}
+                className="flex h-6 w-8 items-center justify-center rounded-full border border-border bg-primary-bg/70 py-0.5 text-text-lighter transition-colors hover:bg-hover hover:text-text"
+              >
+                <MenuIcon size={16} />
+              </button>
+            </Tooltip>
+            <CustomMenuBar
+              activeMenu={menuBarActiveMenu}
+              setActiveMenu={setMenuBarActiveMenu}
+              compactFloating
+            />
+          </div>
         )}
 
         <div className="pointer-events-auto mr-2">
diff --git a/src/features/window/menu-bar/index.tsx b/src/features/window/menu-bar/index.tsx
index eb0871ab..d0e4f87f 100644
--- a/src/features/window/menu-bar/index.tsx
+++ b/src/features/window/menu-bar/index.tsx
@@ -15,9 +15,10 @@ import Submenu from "./submenu";
 interface Props {
   activeMenu: string | null;
   setActiveMenu: React.Dispatch<React.SetStateAction<string | null>>;
+  compactFloating?: boolean;
 }
 
-const CustomMenuBar = ({ activeMenu, setActiveMenu }: Props) => {
+const CustomMenuBar = ({ activeMenu, setActiveMenu, compactFloating = false }: Props) => {
   const { settings } = useSettingsStore();
   const [themes, setThemes] = useState<ThemeDefinition[]>([]);
   const menuBarRef = useRef<HTMLDivElement>(null);
@@ -280,6 +281,10 @@ const CustomMenuBar = ({ activeMenu, setActiveMenu }: Props) => {
       className={cn(
         "z-[10030] flex h-7 items-center gap-1 rounded-full border border-border bg-primary-bg/70 px-1 py-0.5",
         settings.compactMenuBar &&
+          compactFloating &&
+          "absolute top-[calc(100%+4px)] left-0 rounded-2xl border-border bg-primary-bg/95 shadow-xl backdrop-blur-sm",
+        settings.compactMenuBar &&
+          !compactFloating &&
           "absolute inset-0 h-full rounded-none border-none bg-transparent px-2 py-0",
       )}
     >

From 6b879177b42e39461f91db86100eb8e1ab4f152c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mehmet=20=C3=96zg=C3=BCl?= <mehmetozguldev@gmail.com>
Date: Mon, 16 Mar 2026 21:43:24 +0300
Subject: [PATCH 2/2] Hide macOS-only native menu setting

---
 .../components/tabs/appearance-settings.tsx   | 33 ++++++++++---------
 src/features/settings/config/search-index.ts  | 21 +++++++-----
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/features/settings/components/tabs/appearance-settings.tsx b/src/features/settings/components/tabs/appearance-settings.tsx
index 54656790..47bef074 100644
--- a/src/features/settings/components/tabs/appearance-settings.tsx
+++ b/src/features/settings/components/tabs/appearance-settings.tsx
@@ -17,6 +17,7 @@ import { FontSelector } from "@/ui/font-selector";
 import Section, { SettingRow } from "@/ui/section";
 import Select from "@/ui/select";
 import Switch from "@/ui/switch";
+import { IS_MAC } from "@/utils/platform";
 
 export const AppearanceSettings = () => {
   const { settings, updateSetting } = useSettingsStore();
@@ -238,21 +239,23 @@ export const AppearanceSettings = () => {
           />
         </SettingRow>
 
-        <SettingRow
-          label="Native Menu Bar"
-          description="Use the native menu bar or a custom UI menu bar"
-          onReset={() => updateSetting("nativeMenuBar", getDefaultSetting("nativeMenuBar"))}
-          canReset={settings.nativeMenuBar !== getDefaultSetting("nativeMenuBar")}
-        >
-          <Switch
-            checked={settings.nativeMenuBar}
-            onChange={(checked) => {
-              updateSetting("nativeMenuBar", checked);
-              invoke("toggle_menu_bar", { toggle: checked });
-            }}
-            size="sm"
-          />
-        </SettingRow>
+        {IS_MAC && (
+          <SettingRow
+            label="Native Menu Bar"
+            description="Use the native menu bar or a custom UI menu bar"
+            onReset={() => updateSetting("nativeMenuBar", getDefaultSetting("nativeMenuBar"))}
+            canReset={settings.nativeMenuBar !== getDefaultSetting("nativeMenuBar")}
+          >
+            <Switch
+              checked={settings.nativeMenuBar}
+              onChange={(checked) => {
+                updateSetting("nativeMenuBar", checked);
+                invoke("toggle_menu_bar", { toggle: checked });
+              }}
+              size="sm"
+            />
+          </SettingRow>
+        )}
 
         <SettingRow
           label="Compact Menu Bar"
diff --git a/src/features/settings/config/search-index.ts b/src/features/settings/config/search-index.ts
index a2c6af45..495a3353 100644
--- a/src/features/settings/config/search-index.ts
+++ b/src/features/settings/config/search-index.ts
@@ -1,4 +1,5 @@
 import type { SettingSearchRecord } from "../types/search";
+import { IS_MAC } from "@/utils/platform";
 
 export const settingsSearchIndex: SettingSearchRecord[] = [
   // General Settings
@@ -331,14 +332,18 @@ export const settingsSearchIndex: SettingSearchRecord[] = [
     description: "Choose where to position the sidebar",
     keywords: ["sidebar", "position", "left", "right", "layout"],
   },
-  {
-    id: "appearance-native-menu-bar",
-    tab: "appearance",
-    section: "Layout",
-    label: "Native Menu Bar",
-    description: "Use the native menu bar or a custom UI menu bar",
-    keywords: ["menu", "bar", "native", "ui"],
-  },
+  ...(IS_MAC
+    ? [
+        {
+          id: "appearance-native-menu-bar",
+          tab: "appearance",
+          section: "Layout",
+          label: "Native Menu Bar",
+          description: "Use the native menu bar or a custom UI menu bar",
+          keywords: ["menu", "bar", "native", "ui"],
+        } satisfies SettingSearchRecord,
+      ]
+    : []),
   {
     id: "appearance-compact-menu-bar",
     tab: "appearance",