fix: Mouse cursor doesn't follow correctly when swapping windows (#1789)

Author: klesh

Amethyst/Managers/ScreenManager.swift

@@ -238,6 +238,8 @@ final class ScreenManager<Delegate: ScreenManagerDelegate>: NSObject, Codable {
             return
         }
 
+        let mouseFollowsFocus = userConfiguration.mouseFollowsFocus()
+
         let completeOperation = BlockOperation()
 
         // The complete operation should execute the completion delegate call
@@ -248,6 +250,12 @@ final class ScreenManager<Delegate: ScreenManagerDelegate>: NSObject, Codable {
 
             DispatchQueue.main.async {
                 self?.delegate?.onReflowCompletion()
+                if mouseFollowsFocus {
+                    if case .windowSwap(let window, _) = event {
+                        window.focus()
+                    }
+                }
+
             }
         }
 

Amethyst/Managers/WindowTransitionCoordinator.swift

@@ -59,8 +59,7 @@ class WindowTransitionCoordinator<Target: WindowTransitionTarget> {
             guard let lastMainWindow = target?.lastMainWindowForCurrentSpace() else {
                 return
             }
-            target?.executeTransition(.switchWindows(focusedWindow, lastMainWindow))
-            lastMainWindow.focus()
+            target?.executeTransition(.switchWindows(lastMainWindow, focusedWindow))
             return
         }