Adjust always on top behavior

Author: intitni

Core/Sources/HostApp/FeatureSettings/Chat/ChatSettingsGeneralSectionView.swift

@@ -25,7 +25,7 @@ struct ChatSettingsGeneralSectionView: View {
         @AppStorage(\.chatModels) var chatModels
         @AppStorage(\.embeddingModels) var embeddingModels
         @AppStorage(\.wrapCodeInChatCodeBlock) var wrapCodeInCodeBlock
-        @AppStorage(\.alwaysDisableFloatOnTopForChatPanel) var alwaysDisableFloatOnTopForChatPanel
+        @AppStorage(\.chatPanelFloatOnTopOption) var chatPanelFloatOnTopOption
         @AppStorage(
             \.keepFloatOnTopIfChatPanelAndXcodeOverlaps
         ) var keepFloatOnTopIfChatPanelAndXcodeOverlaps
@@ -299,20 +299,23 @@ struct ChatSettingsGeneralSectionView: View {
 
             CodeHighlightThemePicker(scenario: .chat)
 
-            Toggle(isOn: $settings.alwaysDisableFloatOnTopForChatPanel) {
-                Text("Always disable always-on-top.")
+            Picker("Always-on-top behavior", selection: $settings.chatPanelFloatOnTopOption) {
+                Text("Always").tag(UserDefaultPreferenceKeys.ChatPanelFloatOnTopOption.alwaysOnTop)
+                Text("When Xcode is active")
+                    .tag(UserDefaultPreferenceKeys.ChatPanelFloatOnTopOption.onTopWhenXcodeIsActive)
+                Text("Never").tag(UserDefaultPreferenceKeys.ChatPanelFloatOnTopOption.never)
             }
 
             Toggle(isOn: $settings.disableFloatOnTopWhenTheChatPanelIsDetached) {
                 Text("Disable always-on-top when the chat panel is detached")
-            }.disabled(settings.alwaysDisableFloatOnTopForChatPanel)
+            }.disabled(settings.chatPanelFloatOnTopOption == .never)
 
             Toggle(isOn: $settings.keepFloatOnTopIfChatPanelAndXcodeOverlaps) {
                 Text("Keep always-on-top if the chat panel and Xcode overlaps and Xcode is active")
             }
             .disabled(
                 !settings.disableFloatOnTopWhenTheChatPanelIsDetached
-                    || settings.alwaysDisableFloatOnTopForChatPanel
+                    || settings.chatPanelFloatOnTopOption == .never
             )
         }
     }

Core/Sources/SuggestionWidget/WidgetWindowsController.swift

@@ -540,14 +540,14 @@ extension WidgetWindowsController {
 
     @MainActor
     func adjustChatPanelWindowLevel() async {
-        let alwaysDisableChatPanelFlowOnTop = UserDefaults.shared
-            .value(for: \.alwaysDisableFloatOnTopForChatPanel)
+        let flowOnTopOption = UserDefaults.shared
+            .value(for: \.chatPanelFloatOnTopOption)
         let disableFloatOnTopWhenTheChatPanelIsDetached = UserDefaults.shared
             .value(for: \.disableFloatOnTopWhenTheChatPanelIsDetached)
 
         let window = windows.chatPanelWindow
 
-        if alwaysDisableChatPanelFlowOnTop {
+        if flowOnTopOption == .never {
             window.setFloatOnTop(false)
             return
         }
@@ -599,7 +599,14 @@ extension WidgetWindowsController {
                 let overlap = await overlap
                 window.setFloatOnTop(overlap)
             } else {
-                window.setFloatOnTop(false)
+                switch flowOnTopOption {
+                case .onTopWhenXcodeIsActive:
+                    window.setFloatOnTop(false)
+                case .alwaysOnTop:
+                    window.setFloatOnTop(true)
+                case .never:
+                    window.setFloatOnTop(false)
+                }
             }
         }
     }

Tool/Sources/Preferences/Keys.swift

@@ -486,9 +486,15 @@ public extension UserDefaultPreferenceKeys {
     var preferredChatModelIdForUtilities: PreferenceKey<String> {
         .init(defaultValue: "", key: "PreferredChatModelIdForUtilities")
     }
+    
+    enum ChatPanelFloatOnTopOption: Int, Codable, Equatable {
+        case alwaysOnTop
+        case onTopWhenXcodeIsActive
+        case never
+    }
 
-    var alwaysDisableFloatOnTopForChatPanel: PreferenceKey<Bool> {
-        .init(defaultValue: false, key: "AlwaysDisableFloatOnTopForChatPanel")
+    var chatPanelFloatOnTopOption: PreferenceKey<ChatPanelFloatOnTopOption> {
+        .init(defaultValue: .onTopWhenXcodeIsActive, key: "ChatPanelFloatOnTopOption")
     }
 
     var disableFloatOnTopWhenTheChatPanelIsDetached: PreferenceKey<Bool> {

Version.xcconfig

@@ -1,4 +1,4 @@
 APP_VERSION = 0.35.8
-APP_BUILD = 456
+APP_BUILD = 458
 RELEASE_CHANNEL =
 RELEASE_NUMBER = 1