mirror of
https://github.com/ghostty-org/ghostty.git
synced 2025-10-13 13:26:09 +00:00

### This pr fixes multiple issues related to `macos-titlebar-tabs` - [Window title clipping **on Tahoe**](https://github.com/ghostty-org/ghostty/discussions/9027#discussion-8981483) - Clipped tab bar **on Tahoe** when creating new ones in fullscreen > Sequoia doesn't seem to have this issue (at least I didn't reproduce myself) - [Title missing **on Tahoe** after dragging a tab into a separate window](https://github.com/ghostty-org/ghostty/discussions/9027#discussioncomment-14617088) - [Clipped tab bar **on Tahoe** after dragging from one tab group to another](https://github.com/ghostty-org/ghostty/discussions/9027#discussioncomment-14626078) - [Stretched tab bar after switching system appearance](https://github.com/ghostty-org/ghostty/discussions/9027#discussioncomment-14626918) ### Related issues I checked all of the open sub-issues in #2349 , most of them should be fixed in latest main branch (I didn't reproduce) - [#1692](https://github.com/ghostty-org/ghostty/issues/1692) @peteschaffner - [#1945](https://github.com/ghostty-org/ghostty/issues/1945) this one I reproduce only on Tahoe, and fixed in this pr, @injust - [#1813](https://github.com/ghostty-org/ghostty/issues/1813) @jacakira - [#1787](https://github.com/ghostty-org/ghostty/issues/1787) @roguesherlock - [#1691](https://github.com/ghostty-org/ghostty/issues/1691) ~**haven't found a solution yet**(building zig on VM is a pain**)~ > Tried commenting out `isOpaque` check in `TitlebarTabsVenturaTerminalWindow`, which would fix the issue, but I see the note there about transparency issue. > > After commenting it out, it worked fine for me with blur and opacity config, so **I might need some more background on this**. Didn't include this change yet. > > [See screenshot here](https://github.com/user-attachments/assets/eb17642d-b0de-46b2-b42a-19fb38a2c7f0) ### Minor improvements - Match window title style with `window-title-font-family` and focus state <img width="843" height="198" alt="image" src="https://github.com/user-attachments/assets/0138c4fa-1a4b-4bab-a415-b32695899ccf" /> --------- Co-authored-by: Mitchell Hashimoto <m@mitchellh.com>
320 lines
13 KiB
Swift
320 lines
13 KiB
Swift
import AppKit
|
|
import SwiftUI
|
|
|
|
/// `macos-titlebar-style = tabs` for macOS 26 (Tahoe) and later.
|
|
///
|
|
/// This inherits from transparent styling so that the titlebar matches the background color
|
|
/// of the window.
|
|
class TitlebarTabsTahoeTerminalWindow: TransparentTitlebarTerminalWindow, NSToolbarDelegate {
|
|
/// The view model for SwiftUI views
|
|
private var viewModel = ViewModel()
|
|
|
|
/// Titlebar tabs can't support the update accessory because of the way we layout
|
|
/// the native tabs back into the menu bar.
|
|
override var supportsUpdateAccessory: Bool { false }
|
|
|
|
deinit {
|
|
tabBarObserver = nil
|
|
}
|
|
|
|
// MARK: NSWindow
|
|
|
|
override var titlebarFont: NSFont? {
|
|
didSet {
|
|
DispatchQueue.main.async { [weak self] in
|
|
guard let self else { return }
|
|
self.viewModel.titleFont = self.titlebarFont
|
|
}
|
|
}
|
|
}
|
|
|
|
override var title: String {
|
|
didSet {
|
|
DispatchQueue.main.async { [weak self] in
|
|
guard let self else { return }
|
|
self.viewModel.title = self.title
|
|
}
|
|
}
|
|
}
|
|
|
|
override func awakeFromNib() {
|
|
super.awakeFromNib()
|
|
|
|
// We must hide the title since we're going to be moving tabs into
|
|
// the titlebar which have their own title.
|
|
titleVisibility = .hidden
|
|
|
|
// Create a toolbar
|
|
let toolbar = NSToolbar(identifier: "TerminalToolbar")
|
|
toolbar.delegate = self
|
|
toolbar.centeredItemIdentifiers.insert(.title)
|
|
self.toolbar = toolbar
|
|
toolbarStyle = .unifiedCompact
|
|
}
|
|
|
|
override func becomeMain() {
|
|
super.becomeMain()
|
|
|
|
// Check if we have a tab bar and set it up if we have to. See the comment
|
|
// on this function to learn why we need to check this here.
|
|
setupTabBar()
|
|
|
|
viewModel.isMainWindow = true
|
|
}
|
|
|
|
override func resignMain() {
|
|
super.resignMain()
|
|
|
|
viewModel.isMainWindow = false
|
|
}
|
|
// 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) {
|
|
// If this is the tab bar then we need to set it up for the titlebar
|
|
guard isTabBar(childViewController) else {
|
|
// After dragging a tab into a new window, `hasTabBar` needs to be
|
|
// updated to properly review window title
|
|
viewModel.hasTabBar = false
|
|
|
|
super.addTitlebarAccessoryViewController(childViewController)
|
|
return
|
|
}
|
|
|
|
// When an existing tab is being dragged in to another tab group,
|
|
// system will also try to add tab bar to this window, so we want to reset observer,
|
|
// to put tab bar where we want again
|
|
tabBarObserver = nil
|
|
|
|
// Some setup needs to happen BEFORE it is added, such as layout. If
|
|
// we don't do this before the call below, we'll trigger an AppKit
|
|
// assertion.
|
|
childViewController.layoutAttribute = .right
|
|
|
|
super.addTitlebarAccessoryViewController(childViewController)
|
|
|
|
// Setup the tab bar to go into the titlebar.
|
|
DispatchQueue.main.async {
|
|
// HACK: wait a tick before doing anything, to avoid edge cases during startup... :/
|
|
// If we don't do this then on launch windows with restored state with tabs will end
|
|
// up with messed up tab bars that don't show all tabs.
|
|
self.setupTabBar()
|
|
}
|
|
}
|
|
|
|
override func removeTitlebarAccessoryViewController(at index: Int) {
|
|
guard let childViewController = titlebarAccessoryViewControllers[safe: index],
|
|
isTabBar(childViewController) else {
|
|
super.removeTitlebarAccessoryViewController(at: index)
|
|
return
|
|
}
|
|
|
|
super.removeTitlebarAccessoryViewController(at: index)
|
|
|
|
removeTabBar()
|
|
}
|
|
|
|
// MARK: Tab Bar Setup
|
|
|
|
private var tabBarObserver: NSObjectProtocol? {
|
|
didSet {
|
|
// When we change this we want to clear our old observer
|
|
guard let oldValue else { return }
|
|
NotificationCenter.default.removeObserver(oldValue)
|
|
}
|
|
}
|
|
|
|
/// Take the NSTabBar that is on the window and convert it into titlebar tabs.
|
|
///
|
|
/// Let me explain more background on what is happening here. When a tab bar is created, only the
|
|
/// main window actually has an NSTabBar. When an NSWindow in the tab group gains main, AppKit
|
|
/// creates/moves (unsure which) the NSTabBar for it and shows it. When it loses main, the tab bar
|
|
/// is removed from the view hierarchy.
|
|
///
|
|
/// We can't reliably detect this via `addTitlebarAccessoryViewController` because AppKit
|
|
/// creates an accessory view controller for every window in the tab group, but only attaches
|
|
/// the actual NSTabBar to the main window's accessory view.
|
|
///
|
|
/// The best way I've found to detect this is to search for and setup the tab bar anytime the
|
|
/// window gains focus. There are probably edge cases to check but to resolve all this I made
|
|
/// this function which is idempotent to call.
|
|
///
|
|
/// There are more scenarios to look out for and they're documented within the method.
|
|
func setupTabBar() {
|
|
// We only want to setup the observer once
|
|
guard tabBarObserver == nil else { return }
|
|
|
|
// Find our tab bar. If it doesn't exist we don't do anything.
|
|
//
|
|
// In normal window, `NSTabBar` typically appears as a subview of `NSTitlebarView` within `NSThemeFrame`.
|
|
// In fullscreen, the system creates a dedicated fullscreen window and the view hierarchy changes;
|
|
// in that case, the `titlebarView` is only accessible via a reference on `NSThemeFrame`.
|
|
// ref: https://github.com/mozilla-firefox/firefox/blob/054e2b072785984455b3b59acad9444ba1eeffb4/widget/cocoa/nsCocoaWindow.mm#L7205
|
|
guard let themeFrameView = contentView?.rootView else { return }
|
|
let titlebarView = if themeFrameView.responds(to: Selector(("titlebarView"))) {
|
|
themeFrameView.value(forKey: "titlebarView") as? NSView
|
|
} else {
|
|
NSView?.none
|
|
}
|
|
guard let tabBar = titlebarView?.firstDescendant(withClassName: "NSTabBar") else { return }
|
|
|
|
// View model updates must happen on their own ticks.
|
|
DispatchQueue.main.async { [weak self] in
|
|
self?.viewModel.hasTabBar = true
|
|
}
|
|
|
|
// Find our clip view
|
|
guard let clipView = tabBar.firstSuperview(withClassName: "NSTitlebarAccessoryClipView") else { return }
|
|
guard let accessoryView = clipView.subviews[safe: 0] else { return }
|
|
guard let titlebarView else { return }
|
|
guard let toolbarView = titlebarView.firstDescendant(withClassName: "NSToolbarView") else { return }
|
|
|
|
// Make sure tabBar's height won't be stretched
|
|
guard let newTabButton = titlebarView.firstDescendant(withClassName: "NSTabBarNewTabButton") else { return }
|
|
tabBar.frame.size.height = newTabButton.frame.width
|
|
|
|
// The container is the view that we'll constrain our tab bar within.
|
|
let container = toolbarView
|
|
|
|
// The padding for the tab bar. If we're showing window buttons then
|
|
// we need to offset the window buttons.
|
|
let leftPadding: CGFloat = switch(self.derivedConfig.macosWindowButtons) {
|
|
case .hidden: 0
|
|
case .visible: 70
|
|
}
|
|
|
|
// Constrain the accessory clip view (the parent of the accessory view
|
|
// usually that clips the children) to the container view.
|
|
clipView.translatesAutoresizingMaskIntoConstraints = false
|
|
accessoryView.translatesAutoresizingMaskIntoConstraints = false
|
|
|
|
// Setup all our constraints
|
|
NSLayoutConstraint.activate([
|
|
clipView.leftAnchor.constraint(equalTo: container.leftAnchor, constant: leftPadding),
|
|
clipView.rightAnchor.constraint(equalTo: container.rightAnchor),
|
|
clipView.topAnchor.constraint(equalTo: container.topAnchor, constant: 2),
|
|
clipView.heightAnchor.constraint(equalTo: container.heightAnchor),
|
|
accessoryView.leftAnchor.constraint(equalTo: clipView.leftAnchor),
|
|
accessoryView.rightAnchor.constraint(equalTo: clipView.rightAnchor),
|
|
accessoryView.topAnchor.constraint(equalTo: clipView.topAnchor),
|
|
accessoryView.heightAnchor.constraint(equalTo: clipView.heightAnchor),
|
|
])
|
|
|
|
clipView.needsLayout = true
|
|
accessoryView.needsLayout = true
|
|
|
|
// Setup an observer for the NSTabBar frame. When system appearance changes or
|
|
// other events occur, the tab bar can resize and clear our constraints. When this
|
|
// happens, we need to remove our custom constraints and re-apply them once the
|
|
// tab bar has proper dimensions again to avoid constraint conflicts.
|
|
tabBar.postsFrameChangedNotifications = true
|
|
tabBarObserver = NotificationCenter.default.addObserver(
|
|
forName: NSView.frameDidChangeNotification,
|
|
object: tabBar,
|
|
queue: .main
|
|
) { [weak self] _ in
|
|
guard let self else { return }
|
|
|
|
// Remove the observer so we can call setup again.
|
|
self.tabBarObserver = nil
|
|
|
|
// Wait a tick to let the new tab bars appear and then set them up.
|
|
DispatchQueue.main.async {
|
|
self.setupTabBar()
|
|
}
|
|
}
|
|
}
|
|
|
|
func removeTabBar() {
|
|
// View model needs to be updated on another tick because it
|
|
// triggers view updates.
|
|
DispatchQueue.main.async {
|
|
self.viewModel.hasTabBar = false
|
|
}
|
|
|
|
// Clear our observations
|
|
self.tabBarObserver = nil
|
|
}
|
|
|
|
// MARK: NSToolbarDelegate
|
|
|
|
func toolbarAllowedItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
|
|
return [.title, .flexibleSpace, .space]
|
|
}
|
|
|
|
func toolbarDefaultItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
|
|
return [.flexibleSpace, .title, .flexibleSpace]
|
|
}
|
|
|
|
func toolbar(_ toolbar: NSToolbar,
|
|
itemForItemIdentifier itemIdentifier: NSToolbarItem.Identifier,
|
|
willBeInsertedIntoToolbar flag: Bool) -> NSToolbarItem? {
|
|
switch itemIdentifier {
|
|
case .title:
|
|
let item = NSToolbarItem(itemIdentifier: .title)
|
|
item.view = NSHostingView(rootView: TitleItem(viewModel: viewModel))
|
|
// Fix: https://github.com/ghostty-org/ghostty/discussions/9027
|
|
item.view?.setContentCompressionResistancePriority(.required, for: .horizontal)
|
|
item.visibilityPriority = .user
|
|
item.isEnabled = true
|
|
|
|
// This is the documented way to avoid the glass view on an item.
|
|
// We don't want glass on our title.
|
|
item.isBordered = false
|
|
|
|
return item
|
|
default:
|
|
return NSToolbarItem(itemIdentifier: itemIdentifier)
|
|
}
|
|
}
|
|
|
|
// MARK: SwiftUI
|
|
|
|
class ViewModel: ObservableObject {
|
|
@Published var titleFont: NSFont?
|
|
@Published var title: String = "👻 Ghostty"
|
|
@Published var hasTabBar: Bool = false
|
|
@Published var isMainWindow: Bool = true
|
|
}
|
|
}
|
|
|
|
extension NSToolbarItem.Identifier {
|
|
/// Displays the title of the window
|
|
static let title = NSToolbarItem.Identifier("Title")
|
|
}
|
|
|
|
extension TitlebarTabsTahoeTerminalWindow {
|
|
/// Displays the window title
|
|
struct TitleItem: View {
|
|
@ObservedObject var viewModel: ViewModel
|
|
|
|
var title: String {
|
|
// An empty title makes this view zero-sized and NSToolbar on macOS
|
|
// tahoe just deletes the item when that happens. So we use a space
|
|
// instead to ensure there's always some size.
|
|
return viewModel.title.isEmpty ? " " : viewModel.title
|
|
}
|
|
|
|
var body: some View {
|
|
if !viewModel.hasTabBar {
|
|
titleText
|
|
} else {
|
|
// 1x1.gif strikes again! For real: if we render a zero-sized
|
|
// view here then the toolbar just disappears our view. I don't
|
|
// know. This appears fixed in 26.1 Beta but keep it safe for 26.0.
|
|
Color.clear.frame(width: 1, height: 1)
|
|
}
|
|
}
|
|
|
|
@ViewBuilder
|
|
var titleText: some View {
|
|
Text(title)
|
|
.font(viewModel.titleFont.flatMap(Font.init(_:)))
|
|
.foregroundStyle(viewModel.isMainWindow ? .primary : .secondary)
|
|
.lineLimit(1)
|
|
.truncationMode(.tail)
|
|
.frame(maxWidth: .greatestFiniteMagnitude, alignment: .center)
|
|
.opacity(viewModel.hasTabBar ? 0 : 1) // hide when in fullscreen mode, where title bar will appear in the leading area under window buttons
|
|
}
|
|
}
|
|
}
|