Move in-app browser controls into titlebar

Hide the old browser toolbar, center the page title in the titlebar, and add back/forward/reload/home controls next to the traffic lights for a cleaner native macOS browser window.

Made-with: Cursor

classroom_app/ViewController.swift

@@ -6967,6 +6967,12 @@ 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?
+    private weak var titlebarReloadButton: NSButton?
+    private weak var titlebarHomeButton: NSButton?
 
     private var lastLoadedURL: URL?
     private var navigationPolicy: InAppBrowserURLPolicy = .allowAll
@@ -7008,6 +7014,7 @@ private final class InAppBrowserContainerViewController: NSViewController, WKNav
         toolbar.spacing = 8
         toolbar.alignment = .centerY
         toolbar.edgeInsets = NSEdgeInsets(top: 6, left: 10, bottom: 6, right: 10)
+        toolbar.isHidden = true
 
         backButton = makeToolbarButton(title: "◀", symbolName: "chevron.backward", accessibilityDescription: "Back")
         backButton.target = self
@@ -7037,6 +7044,7 @@ private final class InAppBrowserContainerViewController: NSViewController, WKNav
         toolbar.addArrangedSubview(field)
         toolbar.addArrangedSubview(goButton)
         field.widthAnchor.constraint(greaterThanOrEqualToConstant: 240).isActive = true
+        toolbar.heightAnchor.constraint(equalToConstant: 0).isActive = true
 
         let bar = NSProgressIndicator()
         bar.translatesAutoresizingMaskIntoConstraints = false
@@ -7067,7 +7075,7 @@ private final class InAppBrowserContainerViewController: NSViewController, WKNav
 
             bar.leadingAnchor.constraint(equalTo: root.leadingAnchor),
             bar.trailingAnchor.constraint(equalTo: root.trailingAnchor),
-            bar.topAnchor.constraint(equalTo: toolbar.bottomAnchor),
+            bar.topAnchor.constraint(equalTo: root.topAnchor),
             bar.heightAnchor.constraint(equalToConstant: 3),
 
             separator.leadingAnchor.constraint(equalTo: root.leadingAnchor),
@@ -7085,6 +7093,16 @@ private final class InAppBrowserContainerViewController: NSViewController, WKNav
         syncToolbarFromWebView()
     }
 
+    override func viewDidAppear() {
+        super.viewDidAppear()
+        if let window = view.window {
+            installTitlebarButtonsIfNeeded(on: window)
+            installCenteredTitleIfNeeded(on: window)
+            syncWindowTitle()
+            syncToolbarFromWebView()
+        }
+    }
+
     private func makeWebView() -> WKWebView {
         let wv = WKWebView(frame: .zero, configuration: InAppBrowserWebKitSupport.makeWebViewConfiguration())
         wv.translatesAutoresizingMaskIntoConstraints = false
@@ -7157,21 +7175,31 @@ private final class InAppBrowserContainerViewController: NSViewController, WKNav
     private func syncToolbarFromWebView() {
         backButton?.isEnabled = webView.canGoBack
         forwardButton?.isEnabled = webView.canGoForward
+        titlebarBackButton?.isEnabled = webView.canGoBack
+        titlebarForwardButton?.isEnabled = webView.canGoForward
         if webView.isLoading {
             if #available(macOS 11.0, *), let img = NSImage(systemSymbolName: "xmark", accessibilityDescription: "Stop") {
                 reloadStopButton.image = img
                 reloadStopButton.imagePosition = .imageOnly
                 reloadStopButton.title = ""
+                titlebarReloadButton?.image = img
+                titlebarReloadButton?.imagePosition = .imageOnly
+                titlebarReloadButton?.title = ""
             } else {
                 reloadStopButton.title = "Stop"
+                titlebarReloadButton?.title = "Stop"
             }
         } else {
             if #available(macOS 11.0, *), let img = NSImage(systemSymbolName: "arrow.clockwise", accessibilityDescription: "Reload") {
                 reloadStopButton.image = img
                 reloadStopButton.imagePosition = .imageOnly
                 reloadStopButton.title = ""
+                titlebarReloadButton?.image = img
+                titlebarReloadButton?.imagePosition = .imageOnly
+                titlebarReloadButton?.title = ""
             } else {
                 reloadStopButton.title = "Reload"
+                titlebarReloadButton?.title = "Reload"
             }
         }
         syncProgressFromWebView()
@@ -7196,7 +7224,76 @@ private final class InAppBrowserContainerViewController: NSViewController, WKNav
     private func syncWindowTitle() {
         let t = webView.title?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let host = webView.url?.host ?? ""
-        view.window?.title = t.isEmpty ? (host.isEmpty ? "Browser" : host) : t
+        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) {
+        guard titlebarButtonsContainer == nil else { return }
+        guard let titlebarView = window.standardWindowButton(.closeButton)?.superview else { return }
+        guard let zoomButton = window.standardWindowButton(.zoomButton) else { return }
+
+        let stack = NSStackView()
+        stack.translatesAutoresizingMaskIntoConstraints = false
+        stack.orientation = .horizontal
+        stack.alignment = .centerY
+        stack.spacing = 6
+
+        let back = makeToolbarButton(title: "◀", symbolName: "chevron.backward", accessibilityDescription: "Back")
+        back.target = self
+        back.action = #selector(goBack)
+        let forward = makeToolbarButton(title: "▶", symbolName: "chevron.forward", accessibilityDescription: "Forward")
+        forward.target = self
+        forward.action = #selector(goForward)
+        let reload = makeToolbarButton(title: "Reload", symbolName: "arrow.clockwise", accessibilityDescription: "Reload")
+        reload.target = self
+        reload.action = #selector(reloadOrStop)
+        let home = makeToolbarButton(title: "Home", symbolName: "house", accessibilityDescription: "Home")
+        home.target = self
+        home.action = #selector(goHome)
+
+        stack.addArrangedSubview(back)
+        stack.addArrangedSubview(forward)
+        stack.addArrangedSubview(reload)
+        stack.addArrangedSubview(home)
+        titlebarView.addSubview(stack)
+
+        NSLayoutConstraint.activate([
+            stack.leadingAnchor.constraint(equalTo: zoomButton.trailingAnchor, constant: 12),
+            stack.centerYAnchor.constraint(equalTo: zoomButton.centerYAnchor)
+        ])
+
+        titlebarButtonsContainer = stack
+        titlebarBackButton = back
+        titlebarForwardButton = forward
+        titlebarReloadButton = reload
+        titlebarHomeButton = home
     }
 
     func load(url: URL) {
@@ -7223,6 +7320,11 @@ private final class InAppBrowserContainerViewController: NSViewController, WKNav
         }
     }
 
+    @objc private func goHome() {
+        guard let homeURL = URL(string: "https://classroom.google.com/") else { return }
+        load(url: homeURL)
+    }
+
     @objc private func addressFieldSubmitted() {
         let raw = urlField?.stringValue.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         guard raw.isEmpty == false else { return }