From 2360c5a71fa52fd486b063ab50dde6bf193cff5a Mon Sep 17 00:00:00 2001
From: Patrick Dewey <p@pdewey.com>
Date: Sat, 13 Jun 2026 16:25:50 -0400
Subject: [PATCH] add optional native Linux title bar setting

---
 apps/desktop/src/main/index.ts                | 28 +++++++++++++---
 apps/desktop/src/main/vault.ts                |  4 +++
 apps/desktop/src/preload/index.ts             |  4 +++
 packages/app-core/src/App.tsx                 |  7 ++--
 .../app-core/src/components/SettingsModal.tsx | 32 +++++++++++++++++++
 packages/bridge-contract/src/bridge.ts        |  2 ++
 packages/bridge-contract/src/ipc.ts           |  2 ++
 7 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/apps/desktop/src/main/index.ts b/apps/desktop/src/main/index.ts
index f9d36958..63950646 100644
--- a/apps/desktop/src/main/index.ts
+++ b/apps/desktop/src/main/index.ts
@@ -209,6 +209,7 @@ const MAX_ZOOM_FACTOR = 3
 const ZOOM_STEP = 0.1
 const MAC_WINDOW_BACKGROUND_COLOR = '#1f1f1f'
 const MAIN_WINDOW_TABBING_IDENTIFIER = 'zennotes-vault-window'
+
 const APP_WEBSITE_URL = 'https://zennotes.org'
 const APP_DISCORD_URL = 'https://discord.gg/W4fWzapKS6'
 const APP_REPOSITORY_URL = 'https://github.com/ZenNotes/zennotes'
@@ -855,6 +856,7 @@ async function createWindow(options: CreateWindowOptions = {}): Promise<BrowserW
   const createWindowStartedAt = performance.now()
   const mac = isMac()
   const cfg = await loadConfig()
+  const useNativeTitleBar = process.platform === 'linux' && cfg.hideNativeTitleBar === false
   const restoredState = sanitizeWindowState(cfg.windowState)
   currentZoomFactor = normalizeZoomFactor(cfg.zoomFactor)
   const win = new BrowserWindow({
@@ -864,9 +866,11 @@ async function createWindow(options: CreateWindowOptions = {}): Promise<BrowserW
     minWidth: MIN_WINDOW_WIDTH,
     minHeight: MIN_WINDOW_HEIGHT,
     show: false,
+    title: 'ZenNotes',
     autoHideMenuBar: true,
-    titleBarStyle: mac ? 'hiddenInset' : 'hidden',
-    trafficLightPosition: { x: 16, y: 16 },
+    ...(useNativeTitleBar
+      ? {}
+      : ({ titleBarStyle: mac ? 'hiddenInset' : 'hidden', trafficLightPosition: { x: 16, y: 16 } } as const)),
     ...(mac
       ? {
           // The renderer now runs fully opaque, so keeping the
@@ -974,9 +978,11 @@ async function createWindow(options: CreateWindowOptions = {}): Promise<BrowserW
 
   const devServerUrl = process.env['ELECTRON_RENDERER_URL']
   if (devServerUrl) {
-    void win.loadURL(devServerUrl)
+    const url = new URL(devServerUrl)
+    if (useNativeTitleBar) url.searchParams.set('nativeTitleBar', '1')
+    void win.loadURL(url.toString())
   } else {
-    void win.loadFile(path.join(__dirname, '../renderer/index.html'))
+    void win.loadFile(path.join(__dirname, '../renderer/index.html'), useNativeTitleBar ? { query: { nativeTitleBar: '1' } } : undefined)
   }
 
   return win
@@ -2579,6 +2585,20 @@ function registerIpc(): void {
     return await openMarkdownFileFromOS(path.resolve(rawPath), false)
   })
 
+  handle(IPC.APP_GET_WINDOW_CHROME_SETTINGS, async (): Promise<boolean> => {
+    const cfg = await loadConfig()
+    return process.platform === 'linux' ? cfg.hideNativeTitleBar !== false : true
+  })
+
+  handle(
+    IPC.APP_SET_WINDOW_CHROME_SETTINGS,
+    async (_e, hide: boolean): Promise<boolean> => {
+      const hideNativeTitleBar = hide !== false
+      await updateConfig((cfg) => ({ ...cfg, hideNativeTitleBar }))
+      return process.platform === 'linux' ? hideNativeTitleBar : true
+    }
+  )
+
   handle(IPC.WINDOW_TOGGLE_QUICK_CAPTURE, async () => {
     toggleQuickCaptureWindow()
   })
diff --git a/apps/desktop/src/main/vault.ts b/apps/desktop/src/main/vault.ts
index 1fd2dc91..326ed672 100644
--- a/apps/desktop/src/main/vault.ts
+++ b/apps/desktop/src/main/vault.ts
@@ -212,6 +212,8 @@ export interface PersistedConfig {
   remoteWorkspaceProfiles: PersistedRemoteWorkspaceProfile[]
   windowState: PersistedWindowState | null
   zoomFactor: number
+  /** Hide the native Linux/GTK title bar and use ZenNotes' custom renderer chrome. */
+  hideNativeTitleBar?: boolean
   /** Electron accelerator string for the system-wide quick capture hotkey.
    *  Empty string disables the global shortcut. */
   quickCaptureHotkey: string
@@ -231,6 +233,7 @@ const DEFAULT_CONFIG: PersistedConfig = {
   remoteWorkspaceProfiles: [],
   windowState: null,
   zoomFactor: 1,
+  hideNativeTitleBar: true,
   quickCaptureHotkey: DEFAULT_QUICK_CAPTURE_HOTKEY,
   quickCapturePinned: false
 }
@@ -367,6 +370,7 @@ function normalizePersistedConfig(value: unknown): PersistedConfig {
     remoteWorkspaceProfiles,
     windowState: normalizeWindowState(candidate.windowState),
     zoomFactor,
+    hideNativeTitleBar: candidate.hideNativeTitleBar !== false,
     quickCaptureHotkey,
     quickCapturePinned
   }
diff --git a/apps/desktop/src/preload/index.ts b/apps/desktop/src/preload/index.ts
index b27a0975..8a3d0fec 100644
--- a/apps/desktop/src/preload/index.ts
+++ b/apps/desktop/src/preload/index.ts
@@ -447,6 +447,10 @@ const api: ZenBridge = {
     ipcRenderer.invoke(IPC.APP_MOVE_EXTERNAL_FILE_TO_VAULT),
   openMarkdownFile: (absPath: string): Promise<boolean> =>
     ipcRenderer.invoke(IPC.APP_OPEN_MARKDOWN_FILE, absPath),
+  getHideNativeTitleBar: (): Promise<boolean> =>
+    ipcRenderer.invoke(IPC.APP_GET_WINDOW_CHROME_SETTINGS),
+  setHideNativeTitleBar: (hide: boolean): Promise<boolean> =>
+    ipcRenderer.invoke(IPC.APP_SET_WINDOW_CHROME_SETTINGS, hide),
   toggleQuickCapture: (): Promise<void> =>
     ipcRenderer.invoke(IPC.WINDOW_TOGGLE_QUICK_CAPTURE),
   getQuickCaptureHotkey: (): Promise<string> =>
diff --git a/packages/app-core/src/App.tsx b/packages/app-core/src/App.tsx
index 8a916bb4..c5701c28 100644
--- a/packages/app-core/src/App.tsx
+++ b/packages/app-core/src/App.tsx
@@ -25,6 +25,7 @@ const EDITOR_MODULE_WARMUP_GRACE_MS = 40
 let searchPaletteModulePromise: Promise<typeof import('./components/SearchPalette')> | null = null
 const SEARCH_PALETTE_MODULE_WARMUP_DELAY_MS = 40
 const ASSET_UNDO_SHORTCUT_GRACE_MS = 30_000
+const USE_NATIVE_TITLE_BAR = new URLSearchParams(window.location.search).get('nativeTitleBar') === '1'
 
 function loadEditorModule(): Promise<typeof import('./components/Editor')> {
   editorModulePromise ??= import('./components/Editor')
@@ -670,7 +671,7 @@ function App(): JSX.Element {
   if (!hasCompletedOnboarding) {
     return (
       <div className="zn-app-shell w-screen bg-paper-100 text-ink-900">
-        {!zenMode && <TitleBar />}
+        {!zenMode && !USE_NATIVE_TITLE_BAR && <TitleBar />}
         <Suspense fallback={<div className="flex-1" />}>
           <OnboardingWizard />
         </Suspense>
@@ -685,7 +686,7 @@ function App(): JSX.Element {
   if (!vault) {
     return (
       <div className="zn-app-shell w-screen bg-paper-100 text-ink-900">
-        {!zenMode && <TitleBar />}
+        {!zenMode && !USE_NATIVE_TITLE_BAR && <TitleBar />}
         <Suspense fallback={<div className="flex-1" />}>
           <EmptyVault />
         </Suspense>
@@ -699,7 +700,7 @@ function App(): JSX.Element {
 
   return (
     <div className="zn-app-shell flex w-screen flex-col bg-paper-100 text-ink-900">
-      {!zenMode && <TitleBar />}
+      {!zenMode && !USE_NATIVE_TITLE_BAR && <TitleBar />}
       <div className="flex min-h-0 flex-1">
         {!zenMode && sidebarOpen && <Sidebar />}
         {!zenMode && noteListOpen && !unifiedSidebar && <NoteList />}
diff --git a/packages/app-core/src/components/SettingsModal.tsx b/packages/app-core/src/components/SettingsModal.tsx
index 346064cc..a2228854 100644
--- a/packages/app-core/src/components/SettingsModal.tsx
+++ b/packages/app-core/src/components/SettingsModal.tsx
@@ -194,6 +194,7 @@ function formatReleaseNotesForDisplay(notes: string | null): string | null {
 export function SettingsModal(): JSX.Element {
   const zenBridge = getZenBridge()
   const appInfo = zenBridge.getAppInfo()
+  const isLinuxDesktop = appInfo.runtime === 'desktop' && zenBridge.platformSync() === 'linux'
   const supportsRemoteWorkspace =
     appInfo.runtime === 'desktop' && zenBridge.getCapabilities().supportsRemoteWorkspace
   const setSettingsOpen = useStore((s) => s.setSettingsOpen)
@@ -351,6 +352,7 @@ export function SettingsModal(): JSX.Element {
   const setDarkSidebar = useStore((s) => s.setDarkSidebar)
   const showSidebarChevrons = useStore((s) => s.showSidebarChevrons)
   const setShowSidebarChevrons = useStore((s) => s.setShowSidebarChevrons)
+  const [hideNativeTitleBar, setHideNativeTitleBar] = useState(true)
   const appUpdateState = useAppUpdateState()
   const [editingRemoteProfile, setEditingRemoteProfile] = useState<{
     mode: 'create' | 'edit'
@@ -380,6 +382,20 @@ export function SettingsModal(): JSX.Element {
     }
   }, [])
 
+  useEffect(() => {
+    if (!isLinuxDesktop || !zenBridge.getHideNativeTitleBar) return
+    void zenBridge.getHideNativeTitleBar().then(
+      (hide) => setHideNativeTitleBar(hide),
+      () => setHideNativeTitleBar(true)
+    )
+  }, [isLinuxDesktop, zenBridge])
+
+  const persistHideNativeTitleBar = (hideNativeTitleBar: boolean): void => {
+    setHideNativeTitleBar(hideNativeTitleBar)
+    if (!zenBridge.setHideNativeTitleBar) return
+    void zenBridge.setHideNativeTitleBar(hideNativeTitleBar).then(setHideNativeTitleBar)
+  }
+
   useEffect(() => {
     let cancelled = false
     if (typeof window.zen.getVaultTextSearchCapabilities !== 'function') {
@@ -749,6 +765,13 @@ export function SettingsModal(): JSX.Element {
           title: 'Sidebar arrows',
           description: 'Show disclosure arrows for collapsible folders and sidebar sections.',
           keywords: ['chevrons', 'disclosure']
+        },
+        {
+          id: 'native-linux-title-bar',
+          title: 'Native Linux title bar',
+          description: 'Use the GTK title bar instead of ZenNotes custom window chrome after restart.',
+          keywords: ['linux', 'gtk', 'title bar', 'header bar', 'native', 'window chrome'],
+          available: isLinuxDesktop
         }
       ],
       content: (
@@ -850,6 +873,15 @@ export function SettingsModal(): JSX.Element {
               settingId="sidebar-arrows"
               onChange={setShowSidebarChevrons}
             />
+            {isLinuxDesktop && (
+              <ToggleRow
+                label="Native Linux title bar"
+                description="Use the GTK title bar instead of ZenNotes custom window chrome. Applies after restart or when opening a new workspace window."
+                value={!hideNativeTitleBar}
+                settingId="native-linux-title-bar"
+                onChange={(useNative) => persistHideNativeTitleBar(!useNative)}
+              />
+            )}
           </Section>
         </div>
       )
diff --git a/packages/bridge-contract/src/bridge.ts b/packages/bridge-contract/src/bridge.ts
index 169d7476..e6970928 100644
--- a/packages/bridge-contract/src/bridge.ts
+++ b/packages/bridge-contract/src/bridge.ts
@@ -79,6 +79,8 @@ export interface ZenBridge {
   zoomInApp(): Promise<number>
   zoomOutApp(): Promise<number>
   resetAppZoom(): Promise<number>
+  getHideNativeTitleBar?(): Promise<boolean>
+  setHideNativeTitleBar?(hide: boolean): Promise<boolean>
   getAppUpdateState(): Promise<AppUpdateState>
   checkForAppUpdates(): Promise<AppUpdateState>
   checkForAppUpdatesWithUi(): Promise<void>
diff --git a/packages/bridge-contract/src/ipc.ts b/packages/bridge-contract/src/ipc.ts
index 6899638f..7d17254c 100644
--- a/packages/bridge-contract/src/ipc.ts
+++ b/packages/bridge-contract/src/ipc.ts
@@ -79,6 +79,8 @@ export const IPC = {
   APP_ZOOM_IN: 'app:zoom-in',
   APP_ZOOM_OUT: 'app:zoom-out',
   APP_ZOOM_RESET: 'app:zoom-reset',
+  APP_GET_WINDOW_CHROME_SETTINGS: 'app:get-window-chrome-settings',
+  APP_SET_WINDOW_CHROME_SETTINGS: 'app:set-window-chrome-settings',
   APP_UPDATER_GET_STATE: 'app-updater:get-state',
   APP_UPDATER_CHECK: 'app-updater:check',
   APP_UPDATER_CHECK_WITH_UI: 'app-updater:check-with-ui',