Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

gpui: Stop synthetic mouse drags after button release on macOS (#64175)

Vitaly Kravchenko382ff7a64b33
diff --git a/crates/gpui_macos/src/window.rs b/crates/gpui_macos/src/window.rs
index 4156294e5cb..12a75e73ee3 100644
--- a/crates/gpui_macos/src/window.rs
+++ b/crates/gpui_macos/src/window.rs
@@ -3647,6 +3647,18 @@ extern "C" fn dragging_session_ended(
send_file_drop_event(window_state, FileDropEvent::Ended);
}
+fn synthetic_drag_button_is_pressed(button: Option<MouseButton>, pressed: NSUInteger) -> bool {
+ let bit = match button {
+ Some(MouseButton::Left) => 0,
+ Some(MouseButton::Right) => 1,
+ Some(MouseButton::Middle) => 2,
+ Some(MouseButton::Navigate(gpui::NavigationDirection::Back)) => 3,
+ Some(MouseButton::Navigate(gpui::NavigationDirection::Forward)) => 4,
+ None => return false,
+ };
+ pressed & (1 << bit) != 0
+}
+
async fn synthetic_drag(
window_state: Weak<Mutex<MacWindowState>>,
drag_id: usize,
@@ -3655,17 +3667,24 @@ async fn synthetic_drag(
) {
loop {
executor.timer(Duration::from_millis(16)).await;
- if let Some(window_state) = window_state.upgrade() {
- let mut lock = window_state.lock();
- if lock.synthetic_drag_counter == drag_id {
- if let Some(mut callback) = lock.event_callback.take() {
- drop(lock);
- callback(PlatformInput::MouseMove(event.clone()));
- window_state.lock().event_callback = Some(callback);
- }
- } else {
- break;
- }
+ let Some(window_state) = window_state.upgrade() else {
+ break;
+ };
+ let mut lock = window_state.lock();
+ if lock.synthetic_drag_counter != drag_id {
+ break;
+ }
+ // Native menu tracking can consume mouse-up, leaving stale drag events replaying.
+ // Check whether the original mouse button is still physically pressed before replaying.
+ let pressed: NSUInteger = unsafe { msg_send![class!(NSEvent), pressedMouseButtons] };
+ if !synthetic_drag_button_is_pressed(event.pressed_button, pressed) {
+ lock.synthetic_drag_counter += 1;
+ break;
+ }
+ if let Some(mut callback) = lock.event_callback.take() {
+ drop(lock);
+ callback(PlatformInput::MouseMove(event.clone()));
+ window_state.lock().event_callback = Some(callback);
}
}
}