Update to change key window when toggling widget with hotkey

Author: intitni

Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift

@@ -55,8 +55,8 @@ struct GUI: ReducerProtocol {
         case openChatPanel(forceDetach: Bool)
         case createChatGPTChatTabIfNeeded
         case sendCustomCommandToActiveChat(CustomCommand)
-        case toggleWidgets
-        
+        case toggleWidgetsHotkeyPressed
+
         case suggestionWidget(WidgetFeature.Action)
 
         static func promptToCodeGroup(_ action: PromptToCodeGroup.Action) -> Self {
@@ -194,11 +194,18 @@ struct GUI: ReducerProtocol {
                         }
                     }
 
-                case .toggleWidgets:
+                case .toggleWidgetsHotkeyPressed:
+                    let hasChat = state.chatTabGroup.selectedTabInfo != nil
+                    let hasPromptToCode = state.promptToCodeGroup.activePromptToCode != nil
+                    
                     return .run { send in
-                        await send(
-                            .suggestionWidget(.circularWidget(.widgetClicked))
-                        )
+                        await send(.suggestionWidget(.circularWidget(.widgetClicked)))
+
+                        if hasPromptToCode {
+                            await send(.suggestionWidget(.updateKeyWindow(.sharedPanel)))
+                        } else if hasChat {
+                            await send(.suggestionWidget(.updateKeyWindow(.chatPanel)))
+                        }
                     }
 
                 case let .suggestionWidget(.chatPanel(.chatTab(id, .tabContentUpdated))):

Core/Sources/Service/GlobalShortcutManager.swift

@@ -31,7 +31,7 @@ final class GlobalShortcutManager {
             {
                 guiController.viewStore.send(.openChatPanel(forceDetach: true))
             } else {
-                guiController.viewStore.send(.toggleWidgets)
+                guiController.viewStore.send(.toggleWidgetsHotkeyPressed)
             }
 
             if !isExtensionActive {

Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift

@@ -21,6 +21,11 @@ public struct WidgetFeature: ReducerProtocol {
         public var sharedPanelWindowState = WindowState()
         public var tabWindowState = WindowState()
     }
+    
+    public enum WindowCanBecomeKey: Equatable {
+        case sharedPanel
+        case chatPanel
+    }
 
     public struct State: Equatable {
         var focusingDocumentURL: URL?
@@ -112,6 +117,7 @@ public struct WidgetFeature: ReducerProtocol {
         case updateWindowOpacity
         case updateFocusingDocumentURL
         case updateWindowOpacityFinished
+        case updateKeyWindow(WindowCanBecomeKey)
 
         case panel(PanelFeature.Action)
         case chatPanel(ChatPanelFeature.Action)
@@ -578,11 +584,21 @@ public struct WidgetFeature: ReducerProtocol {
                     await send(.updateWindowOpacityFinished)
                 }
                 .cancellable(id: DebounceKey.updateWindowOpacity, cancelInFlight: true)
-
+                
             case .updateWindowOpacityFinished:
                 state.lastUpdateWindowOpacityTime = Date()
                 return .none
 
+            case let .updateKeyWindow(window):
+                return .run { _ in
+                    switch window {
+                    case .chatPanel:
+                        await windows.chatPanelWindow.makeKeyAndOrderFront(nil)
+                    case .sharedPanel:
+                        await windows.sharedPanelWindow.makeKeyAndOrderFront(nil)
+                    }
+                }
+
             case .circularWidget:
                 return .none