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

Fix active view update when center pane is not focused

Browse source
This commit is contained in:
Max Brunsfeld 2023-09-29 14:35:21 -07:00
parent 55da5bc25d
commit 948871969f
1 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2980,30 +2980,28 @@ impl Workspace {
} }
fn update_active_view_for_followers(&self, cx: &AppContext) { fn update_active_view_for_followers(&self, cx: &AppContext) {
let item = self let mut is_project_item = true;
.active_item(cx) let mut update = proto::UpdateActiveView::default();
.and_then(|item| item.to_followable_item_handle(cx)); if self.active_pane.read(cx).has_focus() {
if let Some(item) = item { let item = self
self.update_followers( .active_item(cx)
item.is_project_item(cx), .and_then(|item| item.to_followable_item_handle(cx));
proto::update_followers::Variant::UpdateActiveView(proto::UpdateActiveView { if let Some(item) = item {
is_project_item = item.is_project_item(cx);
update = proto::UpdateActiveView {
id: item id: item
.remote_id(&self.app_state.client, cx) .remote_id(&self.app_state.client, cx)
.map(|id| id.to_proto()), .map(|id| id.to_proto()),
leader_id: self.leader_for_pane(&self.active_pane), leader_id: self.leader_for_pane(&self.active_pane),
}), };
cx, }
);
} else {
self.update_followers(
true,
proto::update_followers::Variant::UpdateActiveView(proto::UpdateActiveView {
id: None,
leader_id: None,
}),
cx,
);
} }
self.update_followers(
is_project_item,
proto::update_followers::Variant::UpdateActiveView(update),
cx,
);
} }
fn update_followers( fn update_followers(