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

Restructure item closing to take the Workspace instead of the Pane

Browse source
This commit is contained in:
Antonio Scandurra 2022-04-05 19:10:44 +02:00
parent 939def42e3
commit cac0dddb1b
3 changed files with 113 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/workspace/src/workspace.rs
View file

@ -497,8 +497,7 @@ impl<T: Item> ItemHandle for ViewHandle<T> {
}
if T::should_close_item_on_event(event) {
pane.update(cx, |pane, cx| pane.close_item(item.id(), cx))
.detach();
Pane::close_item(workspace, pane, item.id(), cx).detach_and_log_err(cx);
return;
}
@ -738,7 +737,7 @@ impl Workspace {
})
.detach();
let pane = cx.add_view(|cx| Pane::new(params.project.clone(), cx));
let pane = cx.add_view(|cx| Pane::new(cx));
let pane_id = pane.id();
cx.observe(&pane, move |me, _, cx| {
let active_entry = me.active_project_path(cx);
@ -1070,7 +1069,7 @@ impl Workspace {
}
fn add_pane(&mut self, cx: &mut ViewContext<Self>) -> ViewHandle<Pane> {
let pane = cx.add_view(|cx| Pane::new(self.project.clone(), cx));
let pane = cx.add_view(|cx| Pane::new(cx));
let pane_id = pane.id();
cx.observe(&pane, move |me, _, cx| {
let active_entry = me.active_project_path(cx);