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

Merge branch 'main' into drag-and-drop

Browse source
This commit is contained in:
K Simmons 2022-08-22 17:18:29 -07:00
commit 13e9336049
65 changed files with 2371 additions and 797 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -110,7 +110,7 @@ actions!(
Paste,
Delete,
Rename,
Toggle
ToggleFocus
]
);
impl_internal_actions!(project_panel, [Open, ToggleExpanded, DeployContextMenu]);
@ -160,7 +160,7 @@ impl ProjectPanel {
{
this.expand_entry(worktree_id, *entry_id, cx);
this.update_visible_entries(Some((worktree_id, *entry_id)), cx);
this.autoscroll();
this.autoscroll(cx);
cx.notify();
}
}
@ -184,6 +184,13 @@ impl ProjectPanel {
)
});
cx.subscribe(&filename_editor, |this, _, event, cx| match event {
editor::Event::BufferEdited | editor::Event::SelectionsChanged { .. } => {
this.autoscroll(cx);
}
_ => {}
})
.detach();
cx.observe_focus(&filename_editor, |this, _, is_focused, cx| {
if !is_focused
&& this
@ -390,7 +397,7 @@ impl ProjectPanel {
worktree_id: *worktree_id,
entry_id: worktree_entries[entry_ix].id,
});
self.autoscroll();
self.autoscroll(cx);
cx.notify();
} else {
self.select_first(cx);
@ -558,6 +565,7 @@ impl ProjectPanel {
.update(cx, |editor, cx| editor.clear(cx));
cx.focus(&self.filename_editor);
self.update_visible_entries(Some((worktree_id, NEW_ENTRY_ID)), cx);
self.autoscroll(cx);
cx.notify();
}
}
@ -587,6 +595,7 @@ impl ProjectPanel {
});
cx.focus(&self.filename_editor);
self.update_visible_entries(None, cx);
self.autoscroll(cx);
cx.notify();
}
}
@ -635,7 +644,7 @@ impl ProjectPanel {
worktree_id: *worktree_id,
entry_id: entry.id,
});
self.autoscroll();
self.autoscroll(cx);
cx.notify();
}
}
@ -657,15 +666,16 @@ impl ProjectPanel {
worktree_id,
entry_id: root_entry.id,
});
self.autoscroll();
self.autoscroll(cx);
cx.notify();
}
}
}
fn autoscroll(&mut self) {
fn autoscroll(&mut self, cx: &mut ViewContext<Self>) {
if let Some((_, _, index)) = self.selection.and_then(|s| self.index_for_selection(s)) {
self.list.scroll_to(ScrollTarget::Show(index));
cx.notify();
}
}