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

Split and move to pane working

Browse source
This commit is contained in:
Kay Simmons 2022-11-08 14:19:31 -08:00
parent 9abfa037fd
commit 738893c527
11 changed files with 206 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
use context_menu::{ContextMenu, ContextMenuItem};
use drag_and_drop::{shared_payloads::DraggedProjectEntry, DragAndDrop, Draggable};
use drag_and_drop::{DragAndDrop, Draggable};
use editor::{Cancel, Editor};
use futures::stream::StreamExt;
use gpui::{
@ -239,6 +239,7 @@ impl ProjectPanel {
worktree_id: worktree.read(cx).id(),
path: entry.path.clone(),
},
None,
focus_opened_item,
cx,
)
@ -607,7 +608,7 @@ impl ProjectPanel {
}
cx.update_global(|drag_and_drop: &mut DragAndDrop<Workspace>, cx| {
drag_and_drop.cancel_dragging::<DraggedProjectEntry>(cx);
drag_and_drop.cancel_dragging::<ProjectEntryId>(cx);
})
}
}
@ -1127,26 +1128,21 @@ impl ProjectPanel {
position: e.position,
})
})
.as_draggable(
DraggedProjectEntry {
path: details.path.clone(),
},
{
let row_container_style = theme.dragged_entry.container;
.as_draggable(entry_id, {
let row_container_style = theme.dragged_entry.container;
move |_, cx: &mut RenderContext<Workspace>| {
let theme = cx.global::<Settings>().theme.clone();
Self::render_entry_visual_element(
&details,
None,
padding,
row_container_style,
&theme.project_panel.dragged_entry,
cx,
)
}
},
)
move |_, cx: &mut RenderContext<Workspace>| {
let theme = cx.global::<Settings>().theme.clone();
Self::render_entry_visual_element(
&details,
None,
padding,
row_container_style,
&theme.project_panel.dragged_entry,
cx,
)
}
})
.with_cursor_style(CursorStyle::PointingHand)
.boxed()
}