Maintain frames on space changes when not changing screens (#1372)

* Only adjust frame when changing screens on space changes * Remove unnecessary focus
ianyh · Apr 1, 2023 · 7d38596 · 7d38596
1 parent 19e93ab
commit 7d38596
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/Amethyst/Managers/WindowManager.swift b/Amethyst/Managers/WindowManager.swift
@@ -732,10 +732,12 @@ extension WindowManager: WindowTransitionTarget {
             }
             markScreen(screen, forReflowWithChange: .remove(window: window))
             window.move(toSpace: targetSpace.id)
-            // necessary to set frame here as window is expected to be at origin relative to targe screen when moved, can be improved.
-            let newFrame = targetScreen.frameWithoutDockOrMenu()
-            DispatchQueue.main.sync {
-                window.setFrame(newFrame, withThreshold: CGSize(width: 25, height: 25))
+            if targetScreen.screenID() != screen.screenID() {
+                // necessary to set frame here as window is expected to be at origin relative to targe screen when moved, can be improved.
+                let newFrame = targetScreen.frameWithoutDockOrMenu()
+                DispatchQueue.main.sync {
+                    window.setFrame(newFrame, withThreshold: CGSize(width: 25, height: 25))
+                }
             }
             markScreen(targetScreen, forReflowWithChange: .add(window: window))
             if UserConfiguration.shared.followWindowsThrownBetweenSpaces() {

diff --git a/Amethyst/Model/Window.swift b/Amethyst/Model/Window.swift
@@ -317,12 +317,6 @@ extension AXWindow: WindowType {
     }
 
     func move(toSpace spaceID: CGSSpaceID) {
-        let ids = [cgID()]
-
-        CGSMoveWindowsToManagedSpace(CGSMainConnectionID(), ids as CFArray, spaceID)
-
-        if UserConfiguration.shared.followWindowsThrownBetweenSpaces() {
-            focus()
-        }
+        CGSMoveWindowsToManagedSpace(CGSMainConnectionID(), [cgID()] as CFArray, spaceID)
     }
 }