mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 20:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #517 from zed-industries/activate-pane-when-activating-item

Browse source 
Make pane active when activating one of its items
This commit is contained in:
Antonio Scandurra 2022-03-02 17:33:12 +01:00 committed by GitHub
commit a9cc8b46e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crates/workspace/src/pane.rs
View file

@ -326,6 +326,7 @@ impl Pane {
}
self.update_active_toolbar(cx);
self.focus_active_item(cx);
self.activate(cx);
cx.notify();
}
}

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

@ -1028,12 +1028,14 @@ impl Workspace {
}
fn activate_pane(&mut self, pane: ViewHandle<Pane>, cx: &mut ViewContext<Self>) {
self.active_pane = pane;
self.status_bar.update(cx, |status_bar, cx| {
status_bar.set_active_pane(&self.active_pane, cx);
});
cx.focus(&self.active_pane);
cx.notify();
if self.active_pane != pane {
self.active_pane = pane;
self.status_bar.update(cx, |status_bar, cx| {
status_bar.set_active_pane(&self.active_pane, cx);
});
cx.focus(&self.active_pane);
cx.notify();
}
}
fn handle_pane_event(