mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-11 21:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Avoid double borrow of view in ProjectPanel drag and drop

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2023-04-21 16:23:47 +02:00
parent 31e906d068
commit f12746c4b7
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/project_panel/src/project_panel.rs
View file

@ -1156,7 +1156,6 @@ impl ProjectPanel {
theme: &theme::ProjectPanel,
cx: &mut ViewContext<Self>,
) -> Element<Self> {
let this = cx.handle().downgrade();
let kind = details.kind;
let path = details.path.clone();
let padding = theme.container.padding.left + details.depth as f32 * theme.indent_width;
@ -1231,21 +1230,17 @@ impl ProjectPanel {
});
}
})
.on_move(move |_, _, cx| {
.on_move(move |_, this, cx| {
if cx
.global::<DragAndDrop<Workspace>>()
.currently_dragged::<ProjectEntryId>(cx.window_id())
.is_some()
{
if let Some(this) = this.upgrade(cx) {
this.update(cx, |this, _| {
this.dragged_entry_destination = if matches!(kind, EntryKind::File(_)) {
path.parent().map(|parent| Arc::from(parent))
} else {
Some(path.clone())
};
})
}
this.dragged_entry_destination = if matches!(kind, EntryKind::File(_)) {
path.parent().map(|parent| Arc::from(parent))
} else {
Some(path.clone())
};
}
})
.as_draggable(entry_id, {