Merge tag '0.37.1' into develop

Author: intitni

Core/Sources/SuggestionWidget/WidgetWindowsController.swift

@@ -281,7 +281,9 @@ 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 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)
@@ -941,7 +943,7 @@ extension CGRect {
         )
         return CGRect(origin: flippedOrigin, size: size)
     }
-    
+
     func relative(to reference: CGRect) -> CGRect {
         let relativeOrigin = CGPoint(
             x: origin.x - reference.origin.x,
@@ -950,3 +952,4 @@ extension CGRect {
         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,7 +87,7 @@ final class OverlayPanel: NSPanel {
     }
 
     func setTopLeftCoordinateFrame(_ frame: CGRect, display: Bool) {
-        let zeroScreen = NSScreen.screens.first { $0.frame == .zero }
+        let zeroScreen = NSScreen.screens.first { $0.frame.origin == .zero }
             ?? NSScreen.primaryScreen ?? NSScreen.main
         let panelFrame = Self.convertAXRectToNSPanelFrame(
             axRect: frame,
@@ -97,7 +98,10 @@ final class OverlayPanel: NSPanel {
         setFrame(panelFrame, display: display)
     }
 
-    static func convertAXRectToNSPanelFrame(axRect: CGRect, forPrimaryScreen 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

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