fix(Window Management): Next/Previous Desktop do not work (#926)

SteveLauC · web-flow · commit ea34b7a404ea · 2025-10-14T17:39:14.000+08:00
This commit fixes the issue that when the current desktop contains more than 1 windows, moving the focused window via `NextDesktop` and `PreviousDesktop` won't work. How? By adding 2 missing `sleep()` functions: 1. https://github.com/ianyh/Silica/blob/b91a18dbb822e99ce6b487d1cb4841e863139b2a/Silica/Sources/SIWindow.m#L242 2. https://github.com/ianyh/Silica/blob/b91a18dbb822e99ce6b487d1cb4841e863139b2a/Silica/Sources/SIWindow.m#L249 Also, this commit improves the implementation by resetting the mouse position. `NextDesktop` and `PreviousDesktop` are implemented by emulating mouse and keyboard events, draging the focused window and switching to the corresponding desktop. To make a window draggable, we have to move the mouse to the window's traffic light area. It is disturbing to not move the mouse back so this commit implements it.
diff --git a/docs/content.en/docs/release-notes/_index.md b/docs/content.en/docs/release-notes/_index.md
@@ -24,6 +24,7 @@ fix: automatic update of service list #913
 fix: duplicate chat content #916
 fix: resolve pinned window shortcut not working #917
 fix: WM ext does not work when operating focused win from another display #919
+fix(Window Management): Next/Previous Desktop do not work #926
 
 ### ✈️ Improvements
 
diff --git a/src-tauri/src/extension/built_in/window_management/backend/mod.rs b/src-tauri/src/extension/built_in/window_management/backend/mod.rs
@@ -8,6 +8,7 @@ use std::ffi::c_ushort;
 use std::ffi::c_void;
 use std::ops::Deref;
 use std::ptr::NonNull;
+use std::time::Duration;
 
 use objc2::MainThreadMarker;
 use objc2_app_kit::NSEvent;
@@ -303,6 +304,10 @@ pub(crate) fn move_frontmost_window_to_workspace(space: usize) -> Result<(), Err
 
     let window_frame = get_frontmost_window_frame()?;
     let close_button_frame = get_frontmost_window_close_button_frame()?;
+    let prev_mouse_position = unsafe {
+        let event = CGEvent::new(None);
+        CGEvent::location(event.as_deref())
+    };
 
     let mouse_cursor_point = CGPoint::new(
         unsafe { CGRectGetMidX(close_button_frame) },
@@ -356,6 +361,9 @@ pub(crate) fn move_frontmost_window_to_workspace(space: usize) -> Result<(), Err
         CGEvent::post(CGEventTapLocation::HIDEventTap, mouse_drag_event.as_deref());
     }
 
+    // Make a slight delay to make sure the window is grabbed
+    std::thread::sleep(Duration::from_millis(50));
+
     // cast is safe as space is in range [1, 16]
     let hot_key: c_ushort = 118 + space as c_ushort - 1;
 
@@ -398,9 +406,30 @@ pub(crate) fn move_frontmost_window_to_workspace(space: usize) -> Result<(), Err
         );
     }
 
+    // Make a slight delay to finish the space transition animation
+    std::thread::sleep(Duration::from_millis(50));
+
+    /*
+     * Cleanup
+     */
     unsafe {
         // Let go of the window.
         CGEvent::post(CGEventTapLocation::HIDEventTap, mouse_up_event.as_deref());
+
+        // Reset mouse position
+        let mouse_reset_event = {
+            CGEvent::new_mouse_event(
+                None,
+                CGEventType::MouseMoved,
+                prev_mouse_position,
+                CGMouseButton::Left,
+            )
+        };
+        CGEvent::set_flags(mouse_reset_event.as_deref(), CGEventFlags(0));
+        CGEvent::post(
+            CGEventTapLocation::HIDEventTap,
+            mouse_reset_event.as_deref(),
+        );
     }
 
     Ok(())
