zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Maintain panel visibility when changing its position

Browse Source
This commit is contained in:
Antonio Scandurra 2023-05-10 11:06:37 +02:00
parent 6e3ce6332a
commit 8fa379bbc5
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/workspace/src/dock.rs
View File

@ -187,9 +187,23 @@ impl Dock {
}
pub fn remove_panel<T: Panel>(&mut self, panel: &ViewHandle<T>, cx: &mut ViewContext<Self>) {
self.panels.retain(|entry| entry.panel.id() != panel.id());
if let Some(panel_ix) = self
.panels
.iter()
.position(|item| item.panel.id() == panel.id())
{
if panel_ix == self.active_item_ix {
self.active_item_ix = 0;
cx.emit(Event::Close);
}
self.panels.remove(panel_ix);
cx.notify();
}
}
pub fn panels_len(&self) -> usize {
self.panels.len()
}
pub fn activate_item(&mut self, item_ix: usize, cx: &mut ViewContext<Self>) {
self.active_item_ix = item_ix;

23
crates/workspace/src/workspace.rs
View File

@ -845,16 +845,31 @@ impl Workspace {
let mut dock = dock.clone();
move |this, panel, event, cx| {
if T::should_change_position_on_event(event) {
dock.update(cx, |dock, cx| dock.remove_panel(&panel, cx));
let mut was_visible = false;
dock.update(cx, |dock, cx| {
was_visible = dock.is_open()
&& dock
.active_item()
.map_or(false, |item| item.as_any().is::<T>());
dock.remove_panel(&panel, cx);
});
dock = match panel.read(cx).position(cx) {
DockPosition::Left => &this.left_dock,
DockPosition::Bottom => &this.bottom_dock,
DockPosition::Right => &this.right_dock,
}.clone();
dock.update(cx, |dock, cx| dock.add_panel(panel, cx));
}
.clone();
dock.update(cx, |dock, cx| {
dock.add_panel(panel, cx);
if was_visible {
dock.set_open(true, cx);
dock.activate_item(dock.panels_len() - 1, cx);
}
});
}
}
}).detach();
})
.detach();
dock.update(cx, |dock, cx| dock.add_panel(panel, cx));
}