From 7bb3c31ceef22b85a9bbd5c2d9e0a41566730681 Mon Sep 17 00:00:00 2001
From: Soh Satoh <20023945+sohsatoh@users.noreply.github.com>
Date: Wed, 1 Jan 2025 02:34:46 +0900
Subject: [PATCH] Move the quick terminal to active space if toggle() called
 while opening on another space

---
 .../Features/QuickTerminal/QuickTerminalController.swift    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/macos/Sources/Features/QuickTerminal/QuickTerminalController.swift b/macos/Sources/Features/QuickTerminal/QuickTerminalController.swift
index 3cae47b1d..4063aa26f 100644
--- a/macos/Sources/Features/QuickTerminal/QuickTerminalController.swift
+++ b/macos/Sources/Features/QuickTerminal/QuickTerminalController.swift
@@ -164,6 +164,12 @@ class QuickTerminalController: BaseTerminalController {
     // MARK: Methods
 
     func toggle() {
+        if derivedConfig.quickTerminalSpaceBehavior == .remain && self.window?.isOnActiveSpace == false {
+            // If we're in the remain mode and the window is not on the active space, then we bring the window back to the active space.
+            self.window?.makeKeyAndOrderFront(nil)
+            return
+        }
+
         if (visible) {
             animateOut()
         } else {