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

Render user avatar only if an user is not in a call

Browse source
This commit is contained in:
Piotr Osiewicz 2023-06-12 20:19:09 +02:00 • committed by Mikayla Maki
parent 83c1bb07bb
commit d079a0eb20
No known key found for this signature in database
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/collab_ui/src/collab_titlebar_item.rs
View file

@ -85,9 +85,9 @@ impl View for CollabTitlebarItem {
left_container
.add_children(self.render_in_call_share_unshare_button(&workspace, &theme, cx));
right_container.add_children(self.render_collaborators(&workspace, &theme, &room, cx));
right_container
left_container
.add_child(self.render_current_user(&workspace, &theme, &user, peer_id, cx));
left_container.add_children(self.render_collaborators(&workspace, &theme, &room, cx));
right_container.add_child(self.render_toggle_screen_sharing_button(&theme, &room, cx));
}
@ -95,7 +95,13 @@ impl View for CollabTitlebarItem {
let status = &*status.borrow();
if matches!(status, client::Status::Connected { .. }) {
right_container.add_child(self.render_toggle_contacts_button(&theme, cx));
let avatar = user.as_ref().map(|user| user.avatar.clone()).flatten();
let avatar = ActiveCall::global(cx)
.read(cx)
.room()
.is_none()
.then(|| user.as_ref())
.flatten()
.and_then(|user| user.avatar.clone());
right_container.add_child(self.render_user_menu_button(&theme, avatar, cx));
} else {
right_container.add_children(self.render_connection_status(status, cx));