oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore collab button tooltips, make screenshare item background of editor background's color (#3924)

Browse Source 
Release Notes:

- Restored collab button tooltips, made screenshare item background of
editor background's color
This commit is contained in:
Kirill Bulatov
2024-01-06 02:07:27 +02:00
committed by GitHub
parent a7901ab8e0 669293e749
commit 621c98b886
2 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/collab_ui/src/collab_titlebar_item.rs
+31
View File
@@ -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)
}),
crates/workspace/src/shared_screen.rs
+10 -6
View File
@@ -66,12 +66,16 @@ impl FocusableView for SharedScreen {
}
}
impl Render for SharedScreen {
fn render(&mut self, _: &mut ViewContext<Self>) -> 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<Self>) -> 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()),
)
}
}