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: remove the duplicated reset zoom accessory view from legacy

Browse Source
This commit is contained in:
Mitchell Hashimoto
2025-06-12 14:42:08 -07:00
parent de40e7ce02
commit 5c8f1948ce
2 changed files with 2 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
macos/Sources/Features/Terminal/TerminalController.swift
View File

@@ -18,7 +18,8 @@ class TerminalController: BaseTerminalController {
case "tabs":
if #available(macOS 26.0, *) {
// TODO: Switch to Tahoe when ready
"TerminalTabsTitlebarTahoe"
"TerminalTabsTitlebarVentura"
//"TerminalTabsTitlebarTahoe"
} else {
"TerminalTabsTitlebarVentura"
}

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

@@ -6,12 +6,6 @@ class TitlebarTabsVenturaTerminalWindow: TerminalWindow {
/// be updated whenever the window background color or surrounding elements changes.
fileprivate var isLightTheme: Bool = false
override var surfaceIsZoomed: Bool {
didSet {
updateResetZoomTitlebarButtonVisibility()
}
}
lazy var titlebarColor: NSColor = backgroundColor {
didSet {
guard let titlebarContainer else { return }
@@ -108,8 +102,6 @@ class TitlebarTabsVenturaTerminalWindow: TerminalWindow {
}
}
updateResetZoomTitlebarButtonVisibility()
// The remainder of this function only applies to styled tabs.
guard hasStyledTabs else { return }
@@ -277,33 +269,6 @@ class TitlebarTabsVenturaTerminalWindow: TerminalWindow {
private lazy var resetZoomToolbarButton: NSButton = generateResetZoomButton()
private lazy var resetZoomTitlebarAccessoryViewController: NSTitlebarAccessoryViewController? = {
guard let titlebarContainer else { return nil }
let size = NSSize(width: titlebarContainer.bounds.height, height: titlebarContainer.bounds.height)
let view = NSView(frame: NSRect(origin: .zero, size: size))
let button = generateResetZoomButton()
button.frame.origin.x = size.width/2 - button.bounds.width/2
button.frame.origin.y = size.height/2 - button.bounds.height/2
view.addSubview(button)
let titlebarAccessoryViewController = NSTitlebarAccessoryViewController()
titlebarAccessoryViewController.view = view
titlebarAccessoryViewController.layoutAttribute = .right
return titlebarAccessoryViewController
}()
private func updateResetZoomTitlebarButtonVisibility() {
guard let tabGroup, let resetZoomTitlebarAccessoryViewController else { return }
if !titlebarAccessoryViewControllers.contains(resetZoomTitlebarAccessoryViewController) {
addTitlebarAccessoryViewController(resetZoomTitlebarAccessoryViewController)
}
resetZoomTitlebarAccessoryViewController.view.isHidden = tabGroup.isTabBarVisible ? true : !surfaceIsZoomed
}
private func generateResetZoomButton() -> NSButton {
let button = NSButton()
button.target = nil
@@ -394,7 +359,6 @@ class TitlebarTabsVenturaTerminalWindow: TerminalWindow {
resetZoomItem.view!.widthAnchor.constraint(equalToConstant: 22).isActive = true
resetZoomItem.view!.heightAnchor.constraint(equalToConstant: 20).isActive = true
}
updateResetZoomTitlebarButtonVisibility()
}
// For titlebar tabs, we want to hide the separator view so that we get rid