Merge branch 'release/0.37.1'

Author: intitni

Core/Sources/SuggestionWidget/WidgetWindowsController.swift

@@ -281,9 +281,13 @@ extension WidgetWindowsController {
                let focusElement = await xcodeInspector.focusedEditor?.element,
                let parent = focusElement.parent,
                let frame = parent.rect,
-               let screen = NSScreen.screens.first(where: { $0.frame.origin == .zero }),
-               let windowContainingScreen = NSScreen.screens
-               .first(where: { $0.frame.contains(frame.origin) })
+               let screen = NSScreen.screens.first(
+                   where: { $0.frame.origin == .zero }
+               ) ?? NSScreen.main,
+               let windowContainingScreen = NSScreen.screens.first(where: {
+                   let flippedScreenFrame = $0.frame.flipped(relativeTo: screen.frame)
+                   return flippedScreenFrame.contains(frame.origin)
+               })
             {
                 let positionMode = UserDefaults.shared
                     .value(for: \.suggestionWidgetPositionMode)
@@ -358,7 +362,7 @@ extension WidgetWindowsController {
                             defaultPanelLocation: .init(frame: .zero, alignPanelTop: false)
                         )
                     }
-
+ 
                     window = workspaceWindow
                     frame = rect
                 }
@@ -475,6 +479,7 @@ extension WidgetWindowsController {
             )
 
             if let suggestionPanelLocation = widgetLocation.suggestionPanelLocation {
+                print(suggestionPanelLocation)
                 windows.suggestionPanelWindow.setFrame(
                     suggestionPanelLocation.frame,
                     display: false,
@@ -930,3 +935,21 @@ func widgetLevel(_ addition: Int) -> NSWindow.Level {
     return .init(minimumWidgetLevel + addition)
 }
 
+extension CGRect {
+    func flipped(relativeTo reference: CGRect) -> CGRect {
+        let flippedOrigin = CGPoint(
+            x: origin.x,
+            y: reference.height - origin.y - height
+        )
+        return CGRect(origin: flippedOrigin, size: size)
+    }
+
+    func relative(to reference: CGRect) -> CGRect {
+        let relativeOrigin = CGPoint(
+            x: origin.x - reference.origin.x,
+            y: origin.y - reference.origin.y
+        )
+        return CGRect(origin: relativeOrigin, size: size)
+    }
+}
+

OverlayWindow/Sources/OverlayWindow/OverlayPanel.swift

@@ -1,6 +1,7 @@
 import AppKit
 import Perception
 import SwiftUI
+import Logger
 
 struct OverlayFrameEnvironmentKey: EnvironmentKey {
     static let defaultValue: CGRect = .zero
@@ -86,18 +87,21 @@ final class OverlayPanel: NSPanel {
     }
 
     func setTopLeftCoordinateFrame(_ frame: CGRect, display: Bool) {
-        let screen = NSScreen.screens
-            .first(where: { $0.frame.intersects(frame) }) ?? NSScreen.main
+        let zeroScreen = NSScreen.screens.first { $0.frame.origin == .zero }
+            ?? NSScreen.primaryScreen ?? NSScreen.main
         let panelFrame = Self.convertAXRectToNSPanelFrame(
             axRect: frame,
-            forScreen: screen
+            forPrimaryScreen: zeroScreen
         )
         panelState.windowFrame = frame
         panelState.windowFrameNSCoordinate = panelFrame
         setFrame(panelFrame, display: display)
     }
 
-    static func convertAXRectToNSPanelFrame(axRect: CGRect, forScreen screen: NSScreen?) -> CGRect {
+    static func convertAXRectToNSPanelFrame(
+        axRect: CGRect,
+        forPrimaryScreen screen: NSScreen?
+    ) -> CGRect {
         guard let screen = screen else { return .zero }
         let screenFrame = screen.frame
         let flippedY = screenFrame.origin.y + screenFrame.size
@@ -139,3 +143,35 @@ func overlayLevel(_ addition: Int) -> NSWindow.Level {
     return .init(minimumWidgetLevel + addition)
 }
 
+public extension CGRect {
+    func flipped(relativeTo reference: CGRect) -> CGRect {
+        let flippedOrigin = CGPoint(
+            x: origin.x,
+            y: reference.height - origin.y - height
+        )
+        return CGRect(origin: flippedOrigin, size: size)
+    }
+
+    func relative(to reference: CGRect) -> CGRect {
+        let relativeOrigin = CGPoint(
+            x: origin.x - reference.origin.x,
+            y: origin.y - reference.origin.y
+        )
+        return CGRect(origin: relativeOrigin, size: size)
+    }
+}
+
+public extension NSScreen {
+    var isPrimary: Bool {
+        let id = deviceDescription[.init("NSScreenNumber")] as? CGDirectDisplayID
+        return id == CGMainDisplayID()
+    }
+
+    static var primaryScreen: NSScreen? {
+        NSScreen.screens.first {
+            let id = $0.deviceDescription[.init("NSScreenNumber")] as? CGDirectDisplayID
+            return id == CGMainDisplayID()
+        }
+    }
+}
+

Version.xcconfig

@@ -1,4 +1,4 @@
-APP_VERSION = 0.37.0
-APP_BUILD = 486
+APP_VERSION = 0.37.1
+APP_BUILD = 489
 RELEASE_CHANNEL =
 RELEASE_NUMBER = 1