From eee58b9ce6e164ffd1b2382c9f730a10dc24c1ff Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 17 May 2024 20:38:51 -0400 Subject: [PATCH] macos: titlebar styling always applies to titlebar tabs --- macos/Sources/Features/Terminal/TerminalWindow.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/macos/Sources/Features/Terminal/TerminalWindow.swift b/macos/Sources/Features/Terminal/TerminalWindow.swift index 070ad46dc..49f12acdf 100644 --- a/macos/Sources/Features/Terminal/TerminalWindow.swift +++ b/macos/Sources/Features/Terminal/TerminalWindow.swift @@ -138,8 +138,12 @@ class TerminalWindow: NSWindow { // The remainder of the styles we only apply if we're on "auto" theming // because they conflict with the appearance being forced a certain - // direction. See issue #1709. - guard let windowTheme, windowTheme == .auto else { return } + // direction. Titlebar tabs are excluded (they always style the titlebar) + // because historically this is how they've always worked. So this + // exclusion only applies to native tabs. See issue #1709. + if let windowTheme, windowTheme != .auto && !titlebarTabs { + return + } titlebarSeparatorStyle = tabbedWindows != nil && !titlebarTabs ? .line : .none