Skip to content

Fix sidebar + toolbar interaction #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicosuave merged 1 commit into from
Apr 5, 2026
Merged

Fix sidebar + toolbar interaction #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions macos/Sources/Features/Terminal/TerminalController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Loading