From 799e9a16c893e8ff1647bfea1935cad52a328a1d Mon Sep 17 00:00:00 2001 From: Nico Ritschel Date: Sun, 5 Apr 2026 09:18:35 -0700 Subject: [PATCH] Override tabs and hidden titlebar styles for Worktrunk sidebar The "tabs" and "hidden" macos-titlebar-style values don't work with the Worktrunk sidebar. "tabs" installs its own toolbar without a sidebar tracking separator, causing the sidebar to be truncated by the toolbar. "hidden" removes the titlebar entirely, losing the sidebar toggle button. Override both to use the "transparent" titlebar, which properly installs the WorktrunkToolbar with a sidebarTrackingSeparator. Fixes #27 --- .../Features/Terminal/TerminalController.swift | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift index 91d52ab721..f40e42a98a 100644 --- a/macos/Sources/Features/Terminal/TerminalController.swift +++ b/macos/Sources/Features/Terminal/TerminalController.swift @@ -184,20 +184,13 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr return defaultValue } + // Ghostree: The "tabs" and "hidden" titlebar styles don't work with the + // Worktrunk sidebar. "tabs" installs its own toolbar without a sidebar tracking + // separator, causing the sidebar to be truncated. "hidden" hides the titlebar + // entirely, removing the sidebar toggle. Override both to "transparent". let nib = switch config.macosTitlebarStyle { case "native": "Terminal" - case "hidden": "TerminalHiddenTitlebar" - case "transparent": "TerminalTransparentTitlebar" - case "tabs": -#if compiler(>=6.2) - if #available(macOS 26.0, *) { - "TerminalTabsTitlebarTahoe" - } else { - "TerminalTabsTitlebarVentura" - } -#else - "TerminalTabsTitlebarVentura" -#endif + case "hidden", "tabs", "transparent": "TerminalTransparentTitlebar" default: defaultValue }