From 3161aedcb02e5e18bc802ffa38504909490938c6 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Wed, 25 Sep 2024 16:03:08 -0700 Subject: [PATCH] Fix broken collaboration UI from #18308 (#18372) Fixes a bug introduced by #18308, that caused the call controls to render incorrectly. Release Notes: - N/A --- crates/title_bar/src/collab.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/title_bar/src/collab.rs b/crates/title_bar/src/collab.rs index e9f89643d5729f0e91ea527033c2b963eba7dd22..2f53458905035824badf3a68b3f0a6b658c06506 100644 --- a/crates/title_bar/src/collab.rs +++ b/crates/title_bar/src/collab.rs @@ -284,14 +284,14 @@ impl TitleBar { let room = room.read(cx); let project = self.project.read(cx); + let is_local = project.is_local() || project.is_via_ssh(); let is_dev_server_project = project.dev_server_project_id().is_some(); - let is_shared = project.is_shared(); + let is_shared = (is_local || is_dev_server_project) && project.is_shared(); let is_muted = room.is_muted(); let is_deafened = room.is_deafened().unwrap_or(false); let is_screen_sharing = room.is_screen_sharing(); let can_use_microphone = room.can_use_microphone(); - let can_share_projects = room.can_share_projects() - && (is_dev_server_project || project.is_local() || project.is_via_ssh()); + let can_share_projects = room.can_share_projects(); let platform_supported = match self.platform_style { PlatformStyle::Mac => true, PlatformStyle::Linux | PlatformStyle::Windows => false, @@ -299,7 +299,7 @@ impl TitleBar { let mut children = Vec::new(); - if can_share_projects { + if (is_local || is_dev_server_project) && can_share_projects { children.push( Button::new( "toggle_sharing",