Merge branch 'feature/chat-panel-with-normal-title-bar' into develop

Author: intitni

Core/Sources/SuggestionWidget/ChatWindowView.swift

@@ -9,6 +9,7 @@ private let r: Double = 8
 
 struct ChatWindowView: View {
     let store: StoreOf<ChatPanelFeature>
+    let toggleVisibility: (Bool) -> Void
 
     struct OverallState: Equatable {
         var isPanelDisplayed: Bool
@@ -28,10 +29,6 @@ struct ChatWindowView: View {
             }
         ) { viewStore in
             VStack(spacing: 0) {
-                ChatTitleBar(store: store)
-
-                Divider()
-
                 ChatTabBar(store: store)
                     .frame(height: 26)
 
@@ -41,9 +38,9 @@ struct ChatWindowView: View {
                     .frame(maxWidth: .infinity, maxHeight: .infinity)
             }
             .background(.regularMaterial)
-            .xcodeStyleFrame()
-            .opacity(viewStore.state.isPanelDisplayed ? 1 : 0)
-            .frame(minWidth: Style.panelWidth, minHeight: Style.panelHeight)
+            .onChange(of: viewStore.state.isPanelDisplayed) { isDisplayed in
+                toggleVisibility(isDisplayed)
+            }
             .preferredColorScheme(viewStore.state.colorScheme)
         }
     }
@@ -55,20 +52,6 @@ struct ChatTitleBar: View {
 
     var body: some View {
         HStack(spacing: 6) {
-            TrafficLightButton(
-                isHovering: isHovering,
-                isActive: true,
-                color: Color(nsColor: .systemOrange),
-                action: {
-                    store.send(.hideButtonClicked)
-                }
-            ) {
-                Image(systemName: "minus")
-                    .foregroundStyle(.black.opacity(0.5))
-                    .font(Font.system(size: 8).weight(.heavy))
-            }
-            .keyboardShortcut("m", modifiers: [.command])
-
             WithViewStore(store, observe: { $0.chatPanelInASeparateWindow }) { viewStore in
                 TrafficLightButton(
                     isHovering: isHovering,
@@ -85,6 +68,8 @@ struct ChatTitleBar: View {
                 }
             }
 
+            Spacer()
+            
             Button(action: {
                 store.send(.closeActiveTabClicked)
             }) {
@@ -93,25 +78,20 @@ struct ChatTitleBar: View {
             .opacity(0)
             .keyboardShortcut("w", modifiers: [.command])
 
-            Spacer()
-        }
-        .buttonStyle(.plain)
-        .overlay {
-            RoundedRectangle(cornerRadius: 2)
-                .fill(.tertiary)
-                .frame(width: 120, height: 4)
-                .background {
-                    if isHovering {
-                        RoundedRectangle(cornerRadius: 6)
-                            .fill(.tertiary.opacity(0.3))
-                            .frame(width: 128, height: 12)
-                    }
+            Button(
+                action: {
+                    store.send(.hideButtonClicked)
                 }
+            ) {
+                Image(systemName: "minus")
+                    .foregroundStyle(.black.opacity(0.5))
+                    .font(Font.system(size: 8).weight(.heavy))
+            }
+            .opacity(0)
+            .keyboardShortcut("m", modifiers: [.command])
         }
-        .padding(.horizontal, 6)
-        .padding(.top, 1)
-        .frame(maxWidth: .infinity)
-        .frame(height: Style.chatWindowTitleBarHeight)
+        .buttonStyle(.plain)
+        .padding(.leading, 2)
         .onHover(perform: { hovering in
             isHovering = hovering
         })
@@ -453,7 +433,7 @@ struct ChatWindowView_Previews: PreviewProvider {
     }
 
     static var previews: some View {
-        ChatWindowView(store: createStore())
+        ChatWindowView(store: createStore(), toggleVisibility: { _ in })
             .xcodeStyleFrame()
             .padding()
             .environment(\.chatTabPool, pool)

Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift

@@ -581,9 +581,9 @@ public struct WidgetFeature: ReducerProtocol {
                             windows.toastWindow.alphaValue = noFocus ? 0 : 1
 
                             if isChatPanelDetached {
-                                windows.chatPanelWindow.alphaValue = hasChat ? 1 : 0
+                                windows.chatPanelWindow.isWindowHidden = !hasChat
                             } else {
-                                windows.chatPanelWindow.alphaValue = noFocus ? 0 : 1
+                                windows.chatPanelWindow.isWindowHidden = noFocus
                             }
                         } else if let activeApp, activeApp.isExtensionService {
                             let noFocus = {
@@ -602,18 +602,18 @@ public struct WidgetFeature: ReducerProtocol {
                             windows.widgetWindow.alphaValue = noFocus ? 0 : 1
                             windows.toastWindow.alphaValue = noFocus ? 0 : 1
                             if isChatPanelDetached {
-                                windows.chatPanelWindow.alphaValue = hasChat ? 1 : 0
+                                windows.chatPanelWindow.isWindowHidden = !hasChat
                             } else {
-                                windows.chatPanelWindow.alphaValue = noFocus && !windows
-                                    .chatPanelWindow.isKeyWindow ? 0 : 1
+                                windows.chatPanelWindow.isWindowHidden = noFocus && !windows
+                                    .chatPanelWindow.isKeyWindow
                             }
                         } else {
                             windows.sharedPanelWindow.alphaValue = 0
                             windows.suggestionPanelWindow.alphaValue = 0
                             windows.widgetWindow.alphaValue = 0
                             windows.toastWindow.alphaValue = 0
                             if !isChatPanelDetached {
-                                windows.chatPanelWindow.alphaValue = 0
+                                windows.chatPanelWindow.isWindowHidden = true
                             }
                         }
                     }

Core/Sources/SuggestionWidget/ModuleDependency.swift

@@ -24,7 +24,7 @@ public final class WidgetWindows {
     var widgetWindow: NSWindow!
     var sharedPanelWindow: NSWindow!
     var suggestionPanelWindow: NSWindow!
-    var chatPanelWindow: NSWindow!
+    var chatPanelWindow: ChatWindow!
     var toastWindow: NSWindow!
 
     nonisolated

Core/Sources/SuggestionWidget/SuggestionWidgetController.swift

@@ -122,26 +122,52 @@ public final class SuggestionWidgetController: NSObject {
     private lazy var chatPanelWindow = {
         let it = ChatWindow(
             contentRect: .zero,
-            styleMask: [.resizable],
+            styleMask: [.resizable, .titled, .miniaturizable],
             backing: .buffered,
             defer: false
         )
+        it.minimizeWindow = { [weak self] in
+            self?.store.send(.chatPanel(.hideButtonClicked))
+        }
+        it.titleVisibility = .hidden
+        it.addTitlebarAccessoryViewController({
+            let controller = NSTitlebarAccessoryViewController()
+            let view = NSHostingView(rootView: ChatTitleBar(store: store.scope(
+                state: \.chatPanelState,
+                action: WidgetFeature.Action.chatPanel
+            )))
+            controller.view = view
+            view.frame = .init(x: 0, y: 0, width: 100, height: 40)
+            controller.layoutAttribute = .left
+            return controller
+        }())
         it.isReleasedWhenClosed = false
         it.isOpaque = false
         it.backgroundColor = .clear
         it.level = .init(NSWindow.Level.floating.rawValue + 1)
-        it.collectionBehavior = [.fullScreenAuxiliary, .transient]
+        it.collectionBehavior = [
+            .fullScreenAuxiliary,
+            .transient,
+            .fullScreenPrimary,
+            .fullScreenAllowsTiling,
+            if #available(macOS 13, *) { [.primary] },
+        ]
         it.hasShadow = true
         it.contentView = NSHostingView(
             rootView: ChatWindowView(
                 store: store.scope(
                     state: \.chatPanelState,
                     action: WidgetFeature.Action.chatPanel
-                )
+                ),
+                toggleVisibility: { [weak it] isDisplayed in
+                    guard let window = it else { return }
+                    window.isPanelDisplayed = isDisplayed
+                }
             )
             .environment(\.chatTabPool, chatTabPool)
         )
         it.setIsVisible(true)
+        it.isPanelDisplayed = false
         it.delegate = self
         return it
     }()
@@ -249,31 +275,6 @@ extension SuggestionWidgetController: NSWindowDelegate {
             store.send(.chatPanel(.detachChatPanel))
         }
     }
-
-    public func windowDidBecomeKey(_ notification: Notification) {
-        guard (notification.object as? NSWindow) === chatPanelWindow else { return }
-        let screenFrame = NSScreen.screens.first(where: { $0.frame.origin == .zero })?
-            .frame ?? .zero
-        var mouseLocation = NSEvent.mouseLocation
-        let windowFrame = chatPanelWindow.frame
-        if mouseLocation.y > windowFrame.maxY - Style.chatWindowTitleBarHeight,
-           mouseLocation.y < windowFrame.maxY,
-           mouseLocation.x > windowFrame.minX,
-           mouseLocation.x < windowFrame.maxX
-        {
-            mouseLocation.y = screenFrame.size.height - mouseLocation.y
-            if let cgEvent = CGEvent(
-                mouseEventSource: nil,
-                mouseType: .leftMouseDown,
-                mouseCursorPosition: mouseLocation,
-                mouseButton: .left
-            ),
-                let event = NSEvent(cgEvent: cgEvent)
-            {
-                chatPanelWindow.performDrag(with: event)
-            }
-        }
-    }
 }
 
 // MARK: - Window Subclasses
@@ -288,16 +289,22 @@ class ChatWindow: NSWindow {
     override var canBecomeKey: Bool { true }
     override var canBecomeMain: Bool { true }
 
-    override func mouseDown(with event: NSEvent) {
-        let windowFrame = frame
-        let currentLocation = event.locationInWindow
-        if currentLocation.y > windowFrame.size.height - Style.chatWindowTitleBarHeight,
-           currentLocation.y < windowFrame.size.height,
-           currentLocation.x > 0,
-           currentLocation.x < windowFrame.width
-        {
-            performDrag(with: event)
+    var minimizeWindow: () -> Void = {}
+
+    var isWindowHidden: Bool = false {
+        didSet {
+            alphaValue = isPanelDisplayed && !isWindowHidden ? 1 : 0
         }
     }
+
+    var isPanelDisplayed: Bool = false {
+        didSet {
+            alphaValue = isPanelDisplayed && !isWindowHidden ? 1 : 0
+        }
+    }
+
+    override func miniaturize(_: Any?) {
+        minimizeWindow()
+    }
 }