diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs index 132410a62a833d80fed864253fafc0e7268e11a1..b8e36fbb741e9a9edc9c690aa079c6545e382715 100644 --- a/crates/collab_ui/src/collab_titlebar_item.rs +++ b/crates/collab_ui/src/collab_titlebar_item.rs @@ -184,6 +184,16 @@ impl Render for CollabTitlebarItem { "toggle_sharing", if is_shared { "Unshare" } else { "Share" }, ) + .tooltip(move |cx| { + Tooltip::text( + if is_shared { + "Stop sharing project with call participants" + } else { + "Share project with call participants" + }, + cx, + ) + }) .style(ButtonStyle::Subtle) .selected_style(ButtonStyle::Tinted(TintColor::Accent)) .selected(is_shared) @@ -202,6 +212,7 @@ impl Render for CollabTitlebarItem { .child( IconButton::new("leave-call", ui::Icon::Exit) .style(ButtonStyle::Subtle) + .tooltip(|cx| Tooltip::text("Leave call", cx)) .icon_size(IconSize::Small) .on_click(move |_, cx| { ActiveCall::global(cx) @@ -219,6 +230,16 @@ impl Render for CollabTitlebarItem { ui::Icon::Mic }, ) + .tooltip(move |cx| { + Tooltip::text( + if is_muted { + "Unmute microphone" + } else { + "Mute microphone" + }, + cx, + ) + }) .style(ButtonStyle::Subtle) .icon_size(IconSize::Small) .selected(is_muted) @@ -260,6 +281,16 @@ impl Render for CollabTitlebarItem { .icon_size(IconSize::Small) .selected(is_screen_sharing) .selected_style(ButtonStyle::Tinted(TintColor::Accent)) + .tooltip(move |cx| { + Tooltip::text( + if is_screen_sharing { + "Stop Sharing Screen" + } else { + "Share Screen" + }, + cx, + ) + }) .on_click(move |_, cx| { crate::toggle_screen_sharing(&Default::default(), cx) }), diff --git a/crates/workspace/src/shared_screen.rs b/crates/workspace/src/shared_screen.rs index dbbe7de6a1897d0049ef65e500e7ab4483452a13..edfabed60d3a03e2290fb94dc9c8482a7e9b4a5e 100644 --- a/crates/workspace/src/shared_screen.rs +++ b/crates/workspace/src/shared_screen.rs @@ -66,12 +66,16 @@ impl FocusableView for SharedScreen { } } impl Render for SharedScreen { - fn render(&mut self, _: &mut ViewContext) -> impl IntoElement { - div().track_focus(&self.focus).size_full().children( - self.frame - .as_ref() - .map(|frame| img(frame.image()).size_full()), - ) + fn render(&mut self, cx: &mut ViewContext) -> impl IntoElement { + div() + .bg(cx.theme().colors().editor_background) + .track_focus(&self.focus) + .size_full() + .children( + self.frame + .as_ref() + .map(|frame| img(frame.image()).size_full()), + ) } }