Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid double borrow of views on up and up_out in DragAndDrop

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2023-04-21 16:19:51 +02:00
parent 5b40641fde
commit 31e906d068
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/drag_and_drop/src/drag_and_drop.rs
View file

@ -209,7 +209,7 @@ impl<V: View> DragAndDrop<V> {
)
.with_cursor_style(CursorStyle::Arrow)
.on_up(MouseButton::Left, |_, _, cx| {
cx.defer(|_, cx| {
cx.window_context().defer(|cx| {
cx.update_global::<Self, _, _>(|this, cx| {
this.finish_dragging(cx)
});
@ -217,7 +217,7 @@ impl<V: View> DragAndDrop<V> {
cx.propagate_event();
})
.on_up_out(MouseButton::Left, |_, _, cx| {
cx.defer(|_, cx| {
cx.window_context().defer(|cx| {
cx.update_global::<Self, _, _>(|this, cx| {
this.finish_dragging(cx)
});
@ -244,14 +244,14 @@ impl<V: View> DragAndDrop<V> {
.boxed()
})
.on_up(MouseButton::Left, |_, _, cx| {
cx.defer(|_, cx| {
cx.window_context().defer(|cx| {
cx.update_global::<Self, _, _>(|this, _| {
this.currently_dragged = None;
});
});
})
.on_up_out(MouseButton::Left, |_, _, cx| {
cx.defer(|_, cx| {
cx.window_context().defer(|cx| {
cx.update_global::<Self, _, _>(|this, _| {
this.currently_dragged = None;
});