From 12311e970776e6a93a712b312fc31abc0ae32770 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Fri, 18 Aug 2023 06:19:54 +0200
Subject: [PATCH] macOS: simplify code for new tab

---
 .../PrimaryWindowController.swift               |  2 +-
 .../Primary Window/PrimaryWindowManager.swift   | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/macos/Sources/Features/Primary Window/PrimaryWindowController.swift b/macos/Sources/Features/Primary Window/PrimaryWindowController.swift
index 257a0bb6f..daa64012c 100644
--- a/macos/Sources/Features/Primary Window/PrimaryWindowController.swift	
+++ b/macos/Sources/Features/Primary Window/PrimaryWindowController.swift	
@@ -14,6 +14,6 @@ class PrimaryWindowController: NSWindowController {
     override func newWindowForTab(_ sender: Any?) {
         guard let window = self.window as? PrimaryWindow else { preconditionFailure("Expected window to be loaded") }
         guard let manager = self.windowManager else { return }
-        manager.newTabForWindow(window: window)
+        manager.triggerNewTab(for: window)
     }
 }
diff --git a/macos/Sources/Features/Primary Window/PrimaryWindowManager.swift b/macos/Sources/Features/Primary Window/PrimaryWindowManager.swift
index 8b8fb94d2..4a608704f 100644
--- a/macos/Sources/Features/Primary Window/PrimaryWindowManager.swift	
+++ b/macos/Sources/Features/Primary Window/PrimaryWindowManager.swift	
@@ -78,15 +78,16 @@ class PrimaryWindowManager {
         newWindow.makeKeyAndOrderFront(nil)
     }
     
-    func newTabForWindow(window: PrimaryWindow) {
+    // triggerNewTab tells the Zig core code to create a new tab, which then calls
+    // back into Swift code.
+    func triggerNewTab(for window: PrimaryWindow) {
         guard let surface = window.focusedSurfaceWrapper.surface else { return }
         ghostty.newTab(surface: surface)
     }
     
     func newTab() {
-        if mainWindow != nil {
-            guard let window = mainWindow as? PrimaryWindow else { return }
-            self.newTabForWindow(window: window)
+        if let window = mainWindow as? PrimaryWindow {
+            self.triggerNewTab(for: window)
         } else {
             self.addNewWindow()
         }
@@ -99,13 +100,7 @@ class PrimaryWindowManager {
         let fontSizeAny = notification.userInfo?[Ghostty.Notification.NewTabKey]
         let fontSize = fontSizeAny as? UInt8
         
-        if fontSize != nil {
-            // Add the new tab to the window with the given font size.
-            self.addNewTab(to: window, withFontSize: fontSize)
-        } else {
-            // No font size specified, just add new tab.
-            self.addNewTab(to: window)
-        }
+        self.addNewTab(to: window, withFontSize: fontSize)
     }
     
     private func addNewTab(to window: NSWindow, withFontSize fontSize: UInt8? = nil) {