Support disabling float on top when the chat panel is detached

Author: intitni

Core/Sources/SuggestionWidget/ChatPanelWindow.swift

@@ -1,13 +1,81 @@
 import AppKit
+import ChatTab
+import Combine
+import ComposableArchitecture
 import Foundation
 import SwiftUI
 
 final class ChatPanelWindow: NSWindow {
     override var canBecomeKey: Bool { true }
     override var canBecomeMain: Bool { true }
 
+    private var cancellable: Set<AnyCancellable> = []
+
     var minimizeWindow: () -> Void = {}
 
+    init(
+        store: StoreOf<ChatPanelFeature>,
+        chatTabPool: ChatTabPool,
+        minimizeWindow: @escaping () -> Void
+    ) {
+        self.minimizeWindow = minimizeWindow
+        super.init(
+            contentRect: .zero,
+            styleMask: [.resizable, .titled, .miniaturizable, .fullSizeContentView],
+            backing: .buffered,
+            defer: false
+        )
+
+        titleVisibility = .hidden
+        addTitlebarAccessoryViewController({
+            let controller = NSTitlebarAccessoryViewController()
+            let view = NSHostingView(rootView: ChatTitleBar(store: store))
+            controller.view = view
+            view.frame = .init(x: 0, y: 0, width: 100, height: 40)
+            controller.layoutAttribute = .right
+            return controller
+        }())
+        titlebarAppearsTransparent = true
+        isReleasedWhenClosed = false
+        isOpaque = false
+        backgroundColor = .clear
+        level = .init(NSWindow.Level.floating.rawValue + 1)
+        collectionBehavior = [
+            .fullScreenAuxiliary,
+            .transient,
+            .fullScreenPrimary,
+            .fullScreenAllowsTiling,
+        ]
+        hasShadow = true
+        contentView = NSHostingView(
+            rootView: ChatWindowView(
+                store: store,
+                toggleVisibility: { [weak self] isDisplayed in
+                    guard let self else { return }
+                    self.isPanelDisplayed = isDisplayed
+                }
+            )
+            .environment(\.chatTabPool, chatTabPool)
+        )
+        setIsVisible(true)
+        isPanelDisplayed = false
+
+        let viewStore = ViewStore(store)
+        viewStore.publisher
+            .map(\.isDetached)
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] isDetached in
+                guard let self else { return }
+                if UserDefaults.shared.value(for: \.disableFloatOnTopWhenTheChatPanelIsDetached) {
+                    self.level = isDetached
+                        ? .init(NSWindow.Level.floating.rawValue)
+                        : .init(NSWindow.Level.mainMenu.rawValue + 1)
+                } else {
+                    self.level = .init(NSWindow.Level.mainMenu.rawValue + 1)
+                }
+            }.store(in: &cancellable)
+    }
+
     var isWindowHidden: Bool = false {
         didSet {
             alphaValue = isPanelDisplayed && !isWindowHidden ? 1 : 0

Core/Sources/SuggestionWidget/WidgetWindowsController.swift

@@ -638,53 +638,15 @@ public final class WidgetWindows {
     @MainActor
     lazy var chatPanelWindow = {
         let it = ChatPanelWindow(
-            contentRect: .zero,
-            styleMask: [.resizable, .titled, .miniaturizable, .fullSizeContentView],
-            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(
+            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 = .right
-            return controller
-        }())
-        it.titlebarAppearsTransparent = true
-        it.isReleasedWhenClosed = false
-        it.isOpaque = false
-        it.backgroundColor = .clear
-        it.level = .init(NSWindow.Level.floating.rawValue + 1)
-        it.collectionBehavior = [
-            .fullScreenAuxiliary,
-            .transient,
-            .fullScreenPrimary,
-            .fullScreenAllowsTiling,
-        ]
-        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)
+            ),
+            chatTabPool: chatTabPool,
+            minimizeWindow: { [weak self] in
+                self?.store.send(.chatPanel(.hideButtonClicked))
+            }
         )
-        it.setIsVisible(true)
-        it.isPanelDisplayed = false
         it.delegate = controller
         return it
     }()

Tool/Sources/Preferences/Keys.swift

@@ -469,6 +469,14 @@ public extension UserDefaultPreferenceKeys {
     var preferredChatModelIdForWebScope: PreferenceKey<String> {
         .init(defaultValue: "", key: "PreferredChatModelIdForWebScope")
     }
+    
+    var disableFloatOnTopWhenTheChatPanelIsDetached: PreferenceKey<Bool> {
+        .init(defaultValue: false, key: "DisableFloatOnTopWhenTheChatPanelIsDetached")
+    }
+    
+    var keepFloatOnTopIfChatPanelAndXcodeOverlaps: PreferenceKey<Bool> {
+        .init(defaultValue: true, key: "KeepFloatOnTopIfChatPanelAndXcodeOverlaps")
+    }
 }
 
 // MARK: - Theme