From e4066aaa85fa24afccd7f8764758f0c33d5f3697 Mon Sep 17 00:00:00 2001
From: Pete Schaffner <peteschaffner@icloud.com>
Date: Wed, 3 Apr 2024 15:36:04 +0200
Subject: [PATCH] Put titlebar font code where it was intended

---
 .../Features/Terminal/TerminalWindow.swift    | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/macos/Sources/Features/Terminal/TerminalWindow.swift b/macos/Sources/Features/Terminal/TerminalWindow.swift
index b89ab1ac2..6067a5aab 100644
--- a/macos/Sources/Features/Terminal/TerminalWindow.swift
+++ b/macos/Sources/Features/Terminal/TerminalWindow.swift
@@ -180,38 +180,6 @@ class TerminalWindow: NSWindow {
 		updateResetZoomTitlebarButtonVisibility()
     }
     
-    // Used to set the titlebar font.
-    var titlebarFont: NSFont? {
-        didSet {
-            titlebarTextField?.font = titlebarFont
-            tab.attributedTitle = attributedTitle
-
-            if let toolbar = toolbar as? TerminalToolbar {
-                toolbar.titleFont = titlebarFont
-            }
-        }
-    }
-
-    // Find the NSTextField responsible for displaying the titlebar's title.
-    private var titlebarTextField: NSTextField? {
-        guard let titlebarContainer = contentView?.superview?.subviews
-            .first(where: { $0.className == "NSTitlebarContainerView" }) else { return nil }
-        guard let titlebarView = titlebarContainer.subviews
-            .first(where: { $0.className == "NSTitlebarView" }) else { return nil }
-        return titlebarView.subviews.first(where: { $0 is NSTextField }) as? NSTextField
-    }
-
-    // Return a styled representation of our title property.
-    private var attributedTitle: NSAttributedString? {
-        guard let titlebarFont else { return nil }
-
-        let attributes: [NSAttributedString.Key: Any] = [
-            .font: titlebarFont,
-            .foregroundColor: isKeyWindow ? NSColor.labelColor : NSColor.secondaryLabelColor,
-        ]
-        return NSAttributedString(string: title, attributes: attributes)
-    }
-
     // MARK: -
 
     private var newTabButtonImageLayer: VibrantLayer? = nil
@@ -375,7 +343,39 @@ class TerminalWindow: NSWindow {
 			}
         }
     }
-    
+
+	// Used to set the titlebar font.
+	var titlebarFont: NSFont? {
+		didSet {
+			titlebarTextField?.font = titlebarFont
+			tab.attributedTitle = attributedTitle
+
+			if let toolbar = toolbar as? TerminalToolbar {
+				toolbar.titleFont = titlebarFont
+			}
+		}
+	}
+
+	// Find the NSTextField responsible for displaying the titlebar's title.
+	private var titlebarTextField: NSTextField? {
+		guard let titlebarContainer = contentView?.superview?.subviews
+			.first(where: { $0.className == "NSTitlebarContainerView" }) else { return nil }
+		guard let titlebarView = titlebarContainer.subviews
+			.first(where: { $0.className == "NSTitlebarView" }) else { return nil }
+		return titlebarView.subviews.first(where: { $0 is NSTextField }) as? NSTextField
+	}
+
+	// Return a styled representation of our title property.
+	private var attributedTitle: NSAttributedString? {
+		guard let titlebarFont else { return nil }
+
+		let attributes: [NSAttributedString.Key: Any] = [
+			.font: titlebarFont,
+			.foregroundColor: isKeyWindow ? NSColor.labelColor : NSColor.secondaryLabelColor,
+		]
+		return NSAttributedString(string: title, attributes: attributes)
+	}
+
     private var windowButtonsBackdrop: WindowButtonsBackdropView? = nil
     private var windowDragHandle: WindowDragView? = nil