Add attach button to title bar

Author: intitni

Core/Sources/SuggestionWidget/ChatWindowView.swift

@@ -52,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,
@@ -82,6 +68,8 @@ struct ChatTitleBar: View {
                 }
             }
 
+            Spacer()
+            
             Button(action: {
                 store.send(.closeActiveTabClicked)
             }) {
@@ -90,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
         })

Core/Sources/SuggestionWidget/SuggestionWidgetController.swift

@@ -129,6 +129,18 @@ public final class SuggestionWidgetController: NSObject {
         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
@@ -138,7 +150,7 @@ public final class SuggestionWidgetController: NSObject {
             .transient,
             .fullScreenPrimary,
             .fullScreenAllowsTiling,
-            if #available(macOS 13, *) { [.primary] }
+            if #available(macOS 13, *) { [.primary] },
         ]
         it.hasShadow = true
         it.contentView = NSHostingView(
@@ -276,21 +288,22 @@ class CanBecomeKeyWindow: NSWindow {
 class ChatWindow: NSWindow {
     override var canBecomeKey: Bool { true }
     override var canBecomeMain: Bool { true }
-    
+
     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(_ sender: Any?) {
+
+    override func miniaturize(_: Any?) {
         minimizeWindow()
     }
 }