mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-09-05 19:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

macos: sequoia should use same tab bar identifier as TerminalWindow

Browse Source
This commit is contained in:
Mitchell Hashimoto
2025-06-13 14:43:01 -07:00
parent 8cfc904c0c
commit 1388c277d5
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
macos/Sources/Features/Terminal/Window Styles/TerminalWindow.swift
View File

@@ -142,7 +142,7 @@ class TerminalWindow: NSWindow {
/// This identifier is attached to the tab bar view controller when we detect it being
/// added.
private static let tabBarIdentifier: NSUserInterfaceItemIdentifier = .init("_ghosttyTabBar")
static let tabBarIdentifier: NSUserInterfaceItemIdentifier = .init("_ghosttyTabBar")
/// Returns true if there is a tab bar visible on this window.
var hasTabBar: Bool {

15
macos/Sources/Features/Terminal/Window Styles/TitlebarTabsVenturaTerminalWindow.swift
View File

@@ -196,8 +196,7 @@ class TitlebarTabsVenturaTerminalWindow: TerminalWindow {
// We can only update titlebar tabs if there is a titlebar. Without the
// styleMask check the app will crash (issue #1876)
if titlebarTabs && styleMask.contains(.titled) {
guard let tabBarAccessoryViewController = titlebarAccessoryViewControllers.first(where: { $0.identifier == Self.TabBarController}) else { return }
guard let tabBarAccessoryViewController = titlebarAccessoryViewControllers.first(where: { $0.identifier == Self.tabBarIdentifier}) else { return }
tabBarAccessoryViewController.layoutAttribute = .right
pushTabsToTitlebar(tabBarAccessoryViewController)
}
@@ -314,9 +313,6 @@ class TitlebarTabsVenturaTerminalWindow: TerminalWindow {
private var windowDragHandle: WindowDragView? = nil
// The tab bar controller ID from macOS
static private let TabBarController = NSUserInterfaceItemIdentifier("_tabBarController")
// Used by the window controller to enable/disable titlebar tabs.
var titlebarTabs = false {
didSet {
@@ -384,10 +380,7 @@ class TitlebarTabsVenturaTerminalWindow: TerminalWindow {
// This is called by macOS for native tabbing in order to add the tab bar. We hook into
// this, detect the tab bar being added, and override its behavior.
override func addTitlebarAccessoryViewController(_ childViewController: NSTitlebarAccessoryViewController) {
let isTabBar = self.titlebarTabs && (
childViewController.layoutAttribute == .bottom ||
childViewController.identifier == Self.TabBarController
)
let isTabBar = self.titlebarTabs && isTabBar(childViewController)
if (isTabBar) {
// Ensure it has the right layoutAttribute to force it next to our titlebar
@@ -399,7 +392,7 @@ class TitlebarTabsVenturaTerminalWindow: TerminalWindow {
// Mark the controller for future reference so we can easily find it. Otherwise
// the tab bar has no ID by default.
childViewController.identifier = Self.TabBarController
childViewController.identifier = Self.tabBarIdentifier
}
super.addTitlebarAccessoryViewController(childViewController)
@@ -410,7 +403,7 @@ class TitlebarTabsVenturaTerminalWindow: TerminalWindow {
}
override func removeTitlebarAccessoryViewController(at index: Int) {
let isTabBar = titlebarAccessoryViewControllers[index].identifier == Self.TabBarController
let isTabBar = titlebarAccessoryViewControllers[index].identifier == Self.tabBarIdentifier
super.removeTitlebarAccessoryViewController(at: index)
if (isTabBar) {
resetCustomTabBarViews()