From 6e622f8c75d6a80b17e1ba5e40d3f9efca410855 Mon Sep 17 00:00:00 2001
From: A-AKB <abdurrahmanakb@icloud.com>
Date: Sat, 28 Feb 2026 01:43:00 +0100
Subject: [PATCH] fix(macos): extract window cascade logic into helper function

---
 .../Terminal/TerminalController.swift         | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/macos/Sources/Features/Terminal/TerminalController.swift b/macos/Sources/Features/Terminal/TerminalController.swift
index 0534a066e..ff4bba833 100644
--- a/macos/Sources/Features/Terminal/TerminalController.swift
+++ b/macos/Sources/Features/Terminal/TerminalController.swift
@@ -198,6 +198,16 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
     // of each other.
     private static var lastCascadePoint = NSPoint(x: 0, y: 0)
 
+    private static func applyCascade(to window: NSWindow, hasFixedPos: Bool) {
+        if hasFixedPos { return }
+
+        if all.count > 1 {
+            lastCascadePoint = window.cascadeTopLeft(from: lastCascadePoint)
+        } else {
+            lastCascadePoint = NSPoint(x: window.frame.minX, y: window.frame.maxY)
+        }
+    }
+
     // The preferred parent terminal controller.
     static var preferredParent: TerminalController? {
         all.first {
@@ -254,13 +264,7 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
             if let window = c.window {
                 if !window.styleMask.contains(.fullScreen) {
                     let hasFixedPos = c.derivedConfig.windowPositionX != nil && c.derivedConfig.windowPositionY != nil
-                    let shouldCascade = !hasFixedPos && TerminalController.all.count > 1
-
-                    if shouldCascade {
-                        Self.lastCascadePoint = window.cascadeTopLeft(from: Self.lastCascadePoint)
-                    } else if !hasFixedPos {
-                        Self.lastCascadePoint = NSPoint(x: window.frame.minX, y: window.frame.maxY)
-                    }
+                    Self.applyCascade(to: window, hasFixedPos: hasFixedPos)
                 }
             }
 
@@ -331,13 +335,7 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
                         window.constrainToScreen()
                     } else {
                         let hasFixedPos = c.derivedConfig.windowPositionX != nil && c.derivedConfig.windowPositionY != nil
-                        let shouldCascade = !hasFixedPos && TerminalController.all.count > 1
-
-                        if shouldCascade {
-                            Self.lastCascadePoint = window.cascadeTopLeft(from: Self.lastCascadePoint)
-                        } else if !hasFixedPos {
-                            Self.lastCascadePoint = NSPoint(x: window.frame.minX, y: window.frame.maxY)
-                        }
+                        Self.applyCascade(to: window, hasFixedPos: hasFixedPos)
                     }
                 }
             }
@@ -444,13 +442,7 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
             if !window.styleMask.contains(.fullScreen) &&
                 window.tabGroup?.windows.count ?? 1 == 1 {
                 let hasFixedPos = controller.derivedConfig.windowPositionX != nil && controller.derivedConfig.windowPositionY != nil
-                let shouldCascade = !hasFixedPos && TerminalController.all.count > 1
-
-                if shouldCascade {
-                    Self.lastCascadePoint = window.cascadeTopLeft(from: Self.lastCascadePoint)
-                } else if !hasFixedPos {
-                    Self.lastCascadePoint = NSPoint(x: window.frame.minX, y: window.frame.maxY)
-                }
+                Self.applyCascade(to: window, hasFixedPos: hasFixedPos)
             }
 
             controller.showWindow(self)