Merge branch 'feature/fix-widget-position-in-shared-space-mode' into develop

Author: intitni

Core/Sources/Preferences/Keys.swift

@@ -124,6 +124,15 @@ public struct UserDefaultPreferenceKeys {
     public var hideCommonPrecedingSpacesInSuggestion: HideCommonPrecedingSpacesInSuggestion {
         .init()
     }
+    
+    public struct ForceOrderWidgetToFront: UserDefaultPreferenceKey {
+        public let defaultValue = true
+        public let key = "ForceOrderWidgetToFront"
+    }
+
+    public var forceOrderWidgetToFront: HideCommonPrecedingSpacesInSuggestion {
+        .init()
+    }
 
     public var disableLazyVStack: FeatureFlags.DisableLazyVStack { .init() }
 }

Core/Sources/SuggestionWidget/SuggestionWidgetController.swift

@@ -315,9 +315,15 @@ extension SuggestionWidgetController {
                 }
 
                 self.updateWindowLocation(animated: false)
-                panelWindow.orderFront(nil)
-                widgetWindow.orderFront(nil)
-                tabWindow.orderFront(nil)
+
+                if UserDefaults.shared.value(for: \.forceOrderWidgetToFront)
+                    || notification.name == kAXWindowMovedNotification
+                {
+                    // We need to bring them front when the app enters fullscreen.
+                    panelWindow.orderFront(nil)
+                    widgetWindow.orderFront(nil)
+                    tabWindow.orderFront(nil)
+                }
             }
         }
     }
@@ -389,8 +395,8 @@ extension SuggestionWidgetController {
                focusElement.description == "Source Editor",
                let parent = focusElement.parent,
                let frame = parent.rect,
-               let screen = NSScreen.main,
-               let firstScreen = NSScreen.screens.first
+               let screen = NSScreen.screens.first(where: { $0.frame.origin == .zero }),
+               let firstScreen = NSScreen.main
             {
                 let mode = UserDefaults.shared.value(for: \.suggestionWidgetPositionMode)
                 switch mode {

Core/Sources/SuggestionWidget/WidgetPositionStrategy.swift

@@ -37,7 +37,7 @@ enum UpdateLocationStrategy {
                 )
             }
             return HorizontalMovable().framesForWindows(
-                y: activeScreen.frame.height - frame.maxY,
+                y: mainScreen.frame.height - frame.maxY,
                 alignPanelTopToAnchor: nil,
                 editorFrame: editorFrame,
                 mainScreen: mainScreen,
@@ -58,7 +58,7 @@ enum UpdateLocationStrategy {
             alignPanelTopToAnchor: Bool
         ) {
             return HorizontalMovable().framesForWindows(
-                y: activeScreen.frame.height - editorFrame.maxY + Style.widgetPadding,
+                y: mainScreen.frame.height - editorFrame.maxY + Style.widgetPadding,
                 alignPanelTopToAnchor: false,
                 editorFrame: editorFrame,
                 mainScreen: mainScreen,
@@ -82,13 +82,13 @@ enum UpdateLocationStrategy {
         ) {
             let maxY = max(
                 y,
-                activeScreen.frame.height - editorFrame.maxY + Style.widgetPadding,
-                4 + mainScreen.frame.minY
+                mainScreen.frame.height - editorFrame.maxY + Style.widgetPadding,
+                4 + activeScreen.frame.minY
             )
             let y = min(
                 maxY,
-                mainScreen.frame.maxY - 4,
-                activeScreen.frame.height - editorFrame.minY - Style.widgetHeight - Style
+                activeScreen.frame.maxY - 4,
+                mainScreen.frame.height - editorFrame.minY - Style.widgetHeight - Style
                     .widgetPadding
             )
 
@@ -101,7 +101,7 @@ enum UpdateLocationStrategy {
 
             let proposedPanelX = proposedAnchorFrameOnTheRightSide.maxX + Style
                 .widgetPadding * 2
-            let putPanelToTheRight = mainScreen.frame.maxX > proposedPanelX + Style.panelWidth
+            let putPanelToTheRight = activeScreen.frame.maxX > proposedPanelX + Style.panelWidth
             let alignPanelTopToAnchor = fixedAlignment ?? (y > activeScreen.frame.midY)
 
             if putPanelToTheRight {
@@ -132,7 +132,7 @@ enum UpdateLocationStrategy {
                 )
                 let proposedPanelX = proposedAnchorFrameOnTheLeftSide.minX - Style
                     .widgetPadding * 2 - Style.panelWidth
-                let putAnchorToTheLeft = proposedPanelX > mainScreen.frame.minX
+                let putAnchorToTheLeft = proposedPanelX > activeScreen.frame.minX
 
                 if putAnchorToTheLeft {
                     let anchorFrame = proposedAnchorFrameOnTheLeftSide

Core/Sources/SuggestionWidget/WidgetView.swift

@@ -94,6 +94,7 @@ struct WidgetContextMenu: View {
     @AppStorage(\.realtimeSuggestionToggle) var realtimeSuggestionToggle
     @AppStorage(\.acceptSuggestionWithAccessibilityAPI) var acceptSuggestionWithAccessibilityAPI
     @AppStorage(\.hideCommonPrecedingSpacesInSuggestion) var hideCommonPrecedingSpacesInSuggestion
+    @AppStorage(\.forceOrderWidgetToFront) var forceOrderWidgetToFront
 
     var body: some View {
         Group {
@@ -133,6 +134,15 @@ struct WidgetContextMenu: View {
                 }
             })
 
+            Button(action: {
+                forceOrderWidgetToFront.toggle()
+            }, label: {
+                Text("Force Order Widget to Front")
+                if forceOrderWidgetToFront {
+                    Image(systemName: "checkmark")
+                }
+            })
+            
             Divider()
 
             Button(action: {