Unify macOS title bar chrome and remove centered title labels.

Use full-size transparent title bars in the main and browser windows, align top content to safe areas around traffic lights, and rely on hidden window titles without custom centered labels.

Made-with: Cursor

classroom_app/Base.lproj/Main.storyboard

@@ -684,7 +684,7 @@
             <objects>
                 <windowController id="B8D-0N-5wS" sceneMemberID="viewController">
                     <window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
-                        <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+                        <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
                         <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
                         <rect key="contentRect" x="196" y="240" width="480" height="270"/>
                         <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>

classroom_app/ViewController.swift

@@ -249,7 +249,6 @@ final class ViewController: NSViewController {
     private var zoomJoinModeByView = [ObjectIdentifier: ZoomJoinMode]()
     private var zoomJoinModeViews: [ZoomJoinMode: NSView] = [:]
     private var settingsActionByView = [ObjectIdentifier: SettingsAction]()
-    private weak var centeredTitleLabel: NSTextField?
     private var paywallWindow: NSWindow?
     private let paywallContentWidth: CGFloat = 520
     private let launchWindowLeftOffset: CGFloat = 80
@@ -432,6 +431,8 @@ final class ViewController: NSViewController {
         applyWindowTitle(for: selectedSidebarPage)
         guard let window = view.window else { return }
 
+        configureUnifiedTitlebar(for: window)
+
         // Ensure launch size is applied even when macOS tries to restore prior window state.
         window.isRestorable = false
         window.setFrameAutosaveName("")
@@ -453,7 +454,6 @@ final class ViewController: NSViewController {
             }
 
             window.minSize = window.frameRect(forContentRect: NSRect(origin: .zero, size: self.launchMinContentSize)).size
-            self.installCenteredTitleIfNeeded(on: window)
         }
     }
 
@@ -1876,6 +1876,12 @@ private extension ViewController {
         return b
     }
 
+    private func configureUnifiedTitlebar(for window: NSWindow) {
+        window.styleMask.insert(.fullSizeContentView)
+        window.titlebarAppearsTransparent = true
+        window.titleVisibility = .hidden
+    }
+
     private func applyWindowTitle(for page: SidebarPage) {
         let title: String
         switch page {
@@ -1891,32 +1897,6 @@ private extension ViewController {
             title = "Settings"
         }
         view.window?.title = title
-        centeredTitleLabel?.stringValue = title
-    }
-
-    private func installCenteredTitleIfNeeded(on window: NSWindow) {
-        guard centeredTitleLabel == nil else { return }
-        guard let titlebarView = window.standardWindowButton(.closeButton)?.superview else { return }
-
-        let label = NSTextField(labelWithString: window.title)
-        label.translatesAutoresizingMaskIntoConstraints = false
-        label.alignment = .center
-        label.font = NSFont.titleBarFont(ofSize: 0)
-        label.textColor = .labelColor
-        label.lineBreakMode = .byTruncatingTail
-        label.maximumNumberOfLines = 1
-
-        titlebarView.addSubview(label)
-
-        NSLayoutConstraint.activate([
-            label.centerXAnchor.constraint(equalTo: titlebarView.centerXAnchor),
-            label.centerYAnchor.constraint(equalTo: titlebarView.centerYAnchor),
-            label.leadingAnchor.constraint(greaterThanOrEqualTo: titlebarView.leadingAnchor, constant: 90),
-            label.trailingAnchor.constraint(lessThanOrEqualTo: titlebarView.trailingAnchor, constant: -90)
-        ])
-
-        window.titleVisibility = .hidden
-        centeredTitleLabel = label
     }
 
     private func updateSidebarAppearance() {
@@ -2011,7 +1991,7 @@ private extension ViewController {
 
         NSLayoutConstraint.activate([
             titleRow.leadingAnchor.constraint(equalTo: sidebar.leadingAnchor, constant: 16),
-            titleRow.topAnchor.constraint(equalTo: sidebar.topAnchor, constant: 24),
+            titleRow.topAnchor.constraint(equalTo: sidebar.safeAreaLayoutGuide.topAnchor, constant: 24),
             titleRow.trailingAnchor.constraint(lessThanOrEqualTo: sidebar.trailingAnchor, constant: -16),
 
             menuStack.leadingAnchor.constraint(equalTo: sidebar.leadingAnchor, constant: 12),
@@ -2113,7 +2093,7 @@ private extension ViewController {
         NSLayoutConstraint.activate([
             authBar.leadingAnchor.constraint(equalTo: panel.leadingAnchor, constant: 28),
             authBar.trailingAnchor.constraint(equalTo: panel.trailingAnchor, constant: -28),
-            authBar.topAnchor.constraint(equalTo: panel.topAnchor, constant: 26),
+            authBar.topAnchor.constraint(equalTo: panel.safeAreaLayoutGuide.topAnchor, constant: 26),
 
             host.leadingAnchor.constraint(equalTo: panel.leadingAnchor),
             host.trailingAnchor.constraint(equalTo: panel.trailingAnchor),
@@ -6919,11 +6899,13 @@ private final class InAppBrowserWindowController: NSWindowController {
     init() {
         let browserWindow = NSWindow(
             contentRect: NSRect(origin: .zero, size: Self.defaultContentSize),
-            styleMask: [.titled, .closable, .miniaturizable, .resizable],
+            styleMask: [.titled, .closable, .miniaturizable, .resizable, .fullSizeContentView],
             backing: .buffered,
             defer: false
         )
         browserWindow.title = "Browser"
+        browserWindow.titlebarAppearsTransparent = true
+        browserWindow.titleVisibility = .hidden
         browserWindow.isRestorable = false
         browserWindow.setFrameAutosaveName("")
         browserWindow.minSize = browserWindow.frameRect(forContentRect: NSRect(origin: .zero, size: Self.minimumContentSize)).size
@@ -6967,7 +6949,6 @@ private final class InAppBrowserContainerViewController: NSViewController, WKNav
     private var reloadStopButton: NSButton!
     private var goButton: NSButton!
     private var progressBar: NSProgressIndicator!
-    private weak var centeredTitleLabel: NSTextField?
     private weak var titlebarButtonsContainer: NSStackView?
     private weak var titlebarBackButton: NSButton?
     private weak var titlebarForwardButton: NSButton?
@@ -7071,11 +7052,11 @@ private final class InAppBrowserContainerViewController: NSViewController, WKNav
         NSLayoutConstraint.activate([
             toolbar.leadingAnchor.constraint(equalTo: root.leadingAnchor),
             toolbar.trailingAnchor.constraint(equalTo: root.trailingAnchor),
-            toolbar.topAnchor.constraint(equalTo: root.topAnchor),
+            toolbar.topAnchor.constraint(equalTo: root.safeAreaLayoutGuide.topAnchor),
 
             bar.leadingAnchor.constraint(equalTo: root.leadingAnchor),
             bar.trailingAnchor.constraint(equalTo: root.trailingAnchor),
-            bar.topAnchor.constraint(equalTo: root.topAnchor),
+            bar.topAnchor.constraint(equalTo: root.safeAreaLayoutGuide.topAnchor),
             bar.heightAnchor.constraint(equalToConstant: 3),
 
             separator.leadingAnchor.constraint(equalTo: root.leadingAnchor),
@@ -7097,7 +7078,6 @@ private final class InAppBrowserContainerViewController: NSViewController, WKNav
         super.viewDidAppear()
         if let window = view.window {
             installTitlebarButtonsIfNeeded(on: window)
-            installCenteredTitleIfNeeded(on: window)
             syncWindowTitle()
             syncToolbarFromWebView()
         }
@@ -7226,32 +7206,6 @@ private final class InAppBrowserContainerViewController: NSViewController, WKNav
         let host = webView.url?.host ?? ""
         let title = t.isEmpty ? (host.isEmpty ? "Browser" : host) : t
         view.window?.title = title
-        centeredTitleLabel?.stringValue = title
-    }
-
-    private func installCenteredTitleIfNeeded(on window: NSWindow) {
-        guard centeredTitleLabel == nil else { return }
-        guard let titlebarView = window.standardWindowButton(.closeButton)?.superview else { return }
-
-        let label = NSTextField(labelWithString: window.title)
-        label.translatesAutoresizingMaskIntoConstraints = false
-        label.alignment = .center
-        label.font = NSFont.titleBarFont(ofSize: 0)
-        label.textColor = .labelColor
-        label.lineBreakMode = .byTruncatingTail
-        label.maximumNumberOfLines = 1
-
-        titlebarView.addSubview(label)
-
-        NSLayoutConstraint.activate([
-            label.centerXAnchor.constraint(equalTo: titlebarView.centerXAnchor),
-            label.centerYAnchor.constraint(equalTo: titlebarView.centerYAnchor),
-            label.leadingAnchor.constraint(greaterThanOrEqualTo: titlebarView.leadingAnchor, constant: 220),
-            label.trailingAnchor.constraint(lessThanOrEqualTo: titlebarView.trailingAnchor, constant: -90)
-        ])
-
-        window.titleVisibility = .hidden
-        centeredTitleLabel = label
     }
 
     private func installTitlebarButtonsIfNeeded(on window: NSWindow) {