Fix QR WiFi window position

Author: ospfranco

macos/sol-macOS/AppDelegate.swift

@@ -174,9 +174,9 @@ class AppDelegate: NSObject, NSApplicationDelegate,
       let txt = $0.string(forType: .string)
       let bundle = $1?.bundle
       guard let txt else { return }
-      
+
       SolEmitter.sharedInstance.textCopied(txt, bundle)
-      
+
       //      let url = $0.string(forType: .URL)
       //      if url != nil {
       //        handlePastedText(url!, fileExtension: "url")
@@ -577,27 +577,34 @@ class AppDelegate: NSObject, NSApplicationDelegate,
     else {
       return
     }
-    
-    let variantEnum: ToastVariant = switch variant {
-    case "error": .error
-    case "success": .success
-    default: .none
-    }
+
+    let variantEnum: ToastVariant =
+      switch variant {
+      case "error": .error
+      case "success": .success
+      default: .none
+      }
 
     let toastView = ToastView(text: text, variant: variantEnum, image: image)
     let rootView = NSHostingView(rootView: toastView)
+    // Force the NSHostingView to size itself based on the SwiftUI view
+    rootView.setFrameSize(rootView.fittingSize)
+
+    // Create the window
     toastWindow.contentView = rootView
+    toastWindow.setContentSize(rootView.fittingSize) // Adjust window size to match the content
 
     let deadline = timeout != nil ? DispatchTime.now() + timeout!.doubleValue : .now() + 2
+    let x = mainScreen.frame.size.width / 2 - toastWindow.frame.width / 2
     var y = mainScreen.frame.origin.y + mainScreen.frame.size.height * 0.1
 
     if image != nil {
-      y += 420
+      y = mainScreen.frame.origin.y + toastWindow.frame.height
     }
 
     toastWindow.setFrameOrigin(
       NSPoint(
-        x: mainScreen.frame.size.width / 2 - toastWindow.frame.width / 2,
+        x: x,
         y: y
       ))
     toastWindow.makeKeyAndOrderFront(nil)

macos/sol-macOS/views/Toast.swift

@@ -1,7 +1,7 @@
 import Foundation
 import Cocoa
 
-final class Toast: NSWindow, NSWindowDelegate {
+final class Toast: NSPanel, NSWindowDelegate {
   init(contentRect: NSRect) {
     super.init(
       contentRect: contentRect,
@@ -26,10 +26,10 @@ final class Toast: NSWindow, NSWindowDelegate {
   }
 
   override var canBecomeKey: Bool {
-    return true
+    return false
   }
 
   override var canBecomeMain: Bool {
-    return true
+    return false
   }
 }

macos/sol-macOS/views/ToastView.swift

@@ -64,7 +64,7 @@ struct ToastView: View {
     }
     .padding(EdgeInsets(top: 10, leading: 15, bottom: 10, trailing: 15))
     .background(
-      VisualEffectBlur(tintColor: variant == .error ? .red : .green)
+      VisualEffectBlur()
         .cornerRadius(10)
     )
     .edgesIgnoringSafeArea(.all)