From b6bfb9dac513972230a87e60363f346e7ac7b5d1 Mon Sep 17 00:00:00 2001
From: Pete Schaffner <peteschaffner@icloud.com>
Date: Sun, 25 Feb 2024 21:47:15 +0100
Subject: [PATCH] Don't use a toolbar for the traditional title/tab bar

I forgot I can use a `NSTitlebarAccessoryViewController` to house the
button
---
 .../ResetZoom.imageset/Contents.json          |  15 +++
 .../ResetZoom.imageset/ResetZoom.pdf          | Bin 0 -> 4795 bytes
 .../Features/Terminal/TerminalToolbar.swift   |  26 +---
 .../Features/Terminal/TerminalWindow.swift    | 112 ++++++++++++------
 4 files changed, 89 insertions(+), 64 deletions(-)
 create mode 100644 macos/Assets.xcassets/ResetZoom.imageset/Contents.json
 create mode 100644 macos/Assets.xcassets/ResetZoom.imageset/ResetZoom.pdf

diff --git a/macos/Assets.xcassets/ResetZoom.imageset/Contents.json b/macos/Assets.xcassets/ResetZoom.imageset/Contents.json
new file mode 100644
index 000000000..b5bca19ac
--- /dev/null
+++ b/macos/Assets.xcassets/ResetZoom.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "ResetZoom.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/macos/Assets.xcassets/ResetZoom.imageset/ResetZoom.pdf b/macos/Assets.xcassets/ResetZoom.imageset/ResetZoom.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..fa36790fc94eb8396b6ea25438d34198f23fedb2
GIT binary patch
literal 4795
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
Q2ZPB#m;?ni^|hG(1L($x`Tzg`

literal 0
HcmV?d00001

diff --git a/macos/Sources/Features/Terminal/TerminalToolbar.swift b/macos/Sources/Features/Terminal/TerminalToolbar.swift
index 42c9c8724..88a093d87 100644
--- a/macos/Sources/Features/Terminal/TerminalToolbar.swift
+++ b/macos/Sources/Features/Terminal/TerminalToolbar.swift
@@ -15,8 +15,6 @@ class TerminalToolbar: NSToolbar, NSToolbarDelegate {
         }
     }
 
-    var hasTitle: Bool = false
-
     override init(identifier: NSToolbar.Identifier) {
         super.init(identifier: identifier)
         
@@ -54,24 +52,6 @@ class TerminalToolbar: NSToolbar, NSToolbarDelegate {
             item.isEnabled = true
         case .resetZoom:
             item = NSToolbarItem(itemIdentifier: .resetZoom)
-
-            let view = NSView(frame: NSRect(x: 0, y: 0, width: 20, height: 20))
-            view.translatesAutoresizingMaskIntoConstraints = false
-            view.widthAnchor.constraint(equalToConstant: 20).isActive = true
-            view.heightAnchor.constraint(equalToConstant: 20).isActive = true
-            
-            let button = NSButton(image: NSImage(systemSymbolName: "arrow.down.right.and.arrow.up.left.square.fill", accessibilityDescription: nil)!, target: nil, action: #selector(TerminalController.splitZoom(_:)))
-
-            button.frame = view.bounds
-            button.isBordered = false
-            button.contentTintColor = .controlAccentColor
-            button.state = .on
-            button.imageScaling = .scaleProportionallyUpOrDown
-			button.allowsExpansionToolTips = true
-			button.toolTip = "Reset Zoom"
-            view.addSubview(button)
-
-            item.view = view
         default:
             item = NSToolbarItem(itemIdentifier: itemIdentifier)
         }
@@ -88,11 +68,7 @@ class TerminalToolbar: NSToolbar, NSToolbarDelegate {
         // getting smaller than the max size so starts clipping. Lucky for us, two of the
         // built-in spacers plus the un-zoom button item seems to exactly match the space
         // on the left that's reserved for the window buttons.
-        if hasTitle {
-            return [.titleText, .flexibleSpace, .space, .space, .resetZoom]
-        } else {
-            return [.flexibleSpace, .resetZoom]
-        }
+		return [.titleText, .flexibleSpace, .space, .space, .resetZoom]
     }
 }
 
diff --git a/macos/Sources/Features/Terminal/TerminalWindow.swift b/macos/Sources/Features/Terminal/TerminalWindow.swift
index d15a02812..c8061d7fa 100644
--- a/macos/Sources/Features/Terminal/TerminalWindow.swift
+++ b/macos/Sources/Features/Terminal/TerminalWindow.swift
@@ -15,30 +15,27 @@ class TerminalWindow: NSWindow {
         }
     }
 
-    private var resetZoomToolbarButton: NSButton? {
-        guard let button = toolbar?.items.first(where: { $0.itemIdentifier == .resetZoom })?.view?.subviews.first as? NSButton
-        else { return nil }
+    private lazy var resetZoomToolbarButton: NSButton = generateResetZoomButton()
 
-        return button
-    }
+    private lazy var resetZoomTabButton: NSButton = generateResetZoomButton()
 
-    private let resetZoomTabButton: NSButton = {
-        let button = NSButton()
-        button.target = nil
-        button.action = #selector(TerminalController.splitZoom(_:))
-        button.translatesAutoresizingMaskIntoConstraints = false
-        button.widthAnchor.constraint(equalToConstant: 20).isActive = true
-        button.heightAnchor.constraint(equalToConstant: 20).isActive = true
-        button.isBordered = false
-		button.allowsExpansionToolTips = true
-		button.toolTip = "Reset Zoom"
-        button.contentTintColor = .controlAccentColor
-        button.state = .on
-        button.image = NSImage(systemSymbolName: "arrow.down.right.and.arrow.up.left.square.fill", accessibilityDescription: nil)!
-            .withSymbolConfiguration(NSImage.SymbolConfiguration(scale: .large))
+	private lazy var resetZoomTitlebarAccessoryViewController: NSTitlebarAccessoryViewController? = {
+		guard let titlebarContainer = contentView?.superview?.subviews.first(where: { $0.className == "NSTitlebarContainerView" }) else { return nil }
 
-        return button
-    }()
+		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 lazy var keyEquivalentLabel: NSTextField = {
         let label = NSTextField(labelWithAttributedString: NSAttributedString())
@@ -50,10 +47,10 @@ class TerminalWindow: NSWindow {
 
     private lazy var bindings = [
         observe(\.surfaceIsZoomed, options: [.initial, .new]) { [weak self] window, _ in
-            guard let resetZoomToolbarButton = self?.resetZoomToolbarButton, let tabGroup = self?.tabGroup else { return }
+            guard let tabGroup = self?.tabGroup else { return }
 
             self?.resetZoomTabButton.isHidden = !window.surfaceIsZoomed
-            self?.updateResetZoomToolbarButtonVisibility()
+            self?.updateResetZoomTitlebarButtonVisibility()
         },
 
         observe(\.keyEquivalent, options: [.initial, .new]) { [weak self] window, _ in
@@ -77,6 +74,8 @@ class TerminalWindow: NSWindow {
     override func awakeFromNib() {
         super.awakeFromNib()
 
+		_ = bindings
+
         // By hiding the visual effect view, we allow the window's (or titlebar's in this case)
         // background color to show through. If we were to set `titlebarAppearsTransparent` to true
         // the selected tab would look fine, but the unselected ones and new tab button backgrounds
@@ -95,9 +94,9 @@ class TerminalWindow: NSWindow {
         stackView.spacing = 3
         tab.accessoryView = stackView
 
-        generateToolbar()
-
-        _ = bindings
+		if titlebarTabs {
+			generateToolbar()
+		}
     }
 
     deinit {
@@ -118,7 +117,7 @@ class TerminalWindow: NSWindow {
         updateNewTabButtonOpacity()
         resetZoomTabButton.isEnabled = true
         resetZoomTabButton.contentTintColor = .controlAccentColor
-        resetZoomToolbarButton?.contentTintColor = .controlAccentColor
+        resetZoomToolbarButton.contentTintColor = .controlAccentColor
     }
 
     override func resignKey() {
@@ -127,13 +126,13 @@ class TerminalWindow: NSWindow {
         updateNewTabButtonOpacity()
         resetZoomTabButton.isEnabled = false
         resetZoomTabButton.contentTintColor = .labelColor
-        resetZoomToolbarButton?.contentTintColor = .tertiaryLabelColor
+        resetZoomToolbarButton.contentTintColor = .tertiaryLabelColor
     }
 
     override func update() {
         super.update()
 
-        updateResetZoomToolbarButtonVisibility()
+        updateResetZoomTitlebarButtonVisibility()
 
         titlebarSeparatorStyle = tabbedWindows != nil && !titlebarTabs ? .line : .none
 
@@ -204,14 +203,24 @@ class TerminalWindow: NSWindow {
         newTabButtonImageView.alphaValue = isKeyWindow ? 1 : 0.5
     }
 
-    private func updateResetZoomToolbarButtonVisibility() {
-        guard let resetZoomToolbarButton = resetZoomToolbarButton, let tabGroup else { return }
+    private func updateResetZoomTitlebarButtonVisibility() {
+        guard let tabGroup, let resetZoomTitlebarAccessoryViewController else { return }
 
-        if tabGroup.isTabBarVisible {
-            resetZoomToolbarButton.isHidden = true
-        } else {
-            resetZoomToolbarButton.isHidden = !surfaceIsZoomed
-        }
+		let isHidden = tabGroup.isTabBarVisible ? true : !surfaceIsZoomed
+
+		if titlebarTabs {
+			resetZoomToolbarButton.isHidden = isHidden
+
+			for (index, vc) in titlebarAccessoryViewControllers.enumerated() {
+				guard vc == resetZoomTitlebarAccessoryViewController else { return }
+				removeTitlebarAccessoryViewController(at: index)
+			}
+		} else {
+			if !titlebarAccessoryViewControllers.contains(resetZoomTitlebarAccessoryViewController) {
+				addTitlebarAccessoryViewController(resetZoomTitlebarAccessoryViewController)
+			}
+			resetZoomTitlebarAccessoryViewController.view.isHidden = isHidden
+		}
     }
 
     // We have to regenerate a toolbar when the titlebar tabs setting changes since our
@@ -220,20 +229,45 @@ class TerminalWindow: NSWindow {
     // isn't possible.
     private func generateToolbar() {
         let terminalToolbar = TerminalToolbar(identifier: "Toolbar")
-        terminalToolbar.hasTitle = titlebarTabs
 
         toolbar = terminalToolbar
         toolbarStyle = .unifiedCompact
-        updateResetZoomToolbarButtonVisibility()
+		if let resetZoomItem = terminalToolbar.items.first(where: { $0.itemIdentifier == .resetZoom }) {
+			resetZoomItem.view = resetZoomToolbarButton
+			resetZoomItem.view?.translatesAutoresizingMaskIntoConstraints = false
+			resetZoomItem.view?.widthAnchor.constraint(equalToConstant: 22).isActive = true
+			resetZoomItem.view?.heightAnchor.constraint(equalToConstant: 20).isActive = true
+		}
+        updateResetZoomTitlebarButtonVisibility()
     }
 
+	private func generateResetZoomButton() -> NSButton {
+		let button = NSButton()
+		button.target = nil
+		button.action = #selector(TerminalController.splitZoom(_:))
+		button.isBordered = false
+		button.allowsExpansionToolTips = true
+		button.toolTip = "Reset Zoom"
+		button.contentTintColor = .controlAccentColor
+		button.state = .on
+		button.image = NSImage(named:"ResetZoom")
+		button.frame = NSRect(x: 0, y: 0, width: 20, height: 20)
+		button.translatesAutoresizingMaskIntoConstraints = false
+		button.widthAnchor.constraint(equalToConstant: 20).isActive = true
+		button.heightAnchor.constraint(equalToConstant: 20).isActive = true
+
+		return button
+	}
+
     // MARK: - Titlebar Tabs
     
     // Used by the window controller to enable/disable titlebar tabs.
     var titlebarTabs = false {
         didSet {
             self.titleVisibility = titlebarTabs ? .hidden : .visible
-            generateToolbar()
+			if titlebarTabs {
+				generateToolbar()
+			}
         }
     }