From 0e145a843507a6c61bfc82538d244ab6a1b0cb51 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 22 Dec 2023 19:32:07 -0500 Subject: [PATCH] Make current call controls in title bar smaller (#3800) This PR adjusts the sizes of the current call controls in the title bar to be smaller. This matches the size of the other title bar items that are always present. Release Notes: - N/A --- crates/collab_ui2/src/collab_titlebar_item.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crates/collab_ui2/src/collab_titlebar_item.rs b/crates/collab_ui2/src/collab_titlebar_item.rs index 02c4446a9af41184f851795fcfcef0ca5e60518e..6255e2b833daf2028675fba197bc80d28a1fdea4 100644 --- a/crates/collab_ui2/src/collab_titlebar_item.rs +++ b/crates/collab_ui2/src/collab_titlebar_item.rs @@ -183,6 +183,7 @@ impl Render for CollabTitlebarItem { if is_shared { "Unshare" } else { "Share" }, ) .style(ButtonStyle::Subtle) + .label_size(LabelSize::Small) .on_click(cx.listener( move |this, _, cx| { if is_shared { @@ -197,6 +198,7 @@ impl Render for CollabTitlebarItem { .child( IconButton::new("leave-call", ui::Icon::Exit) .style(ButtonStyle::Subtle) + .icon_size(IconSize::Small) .on_click(move |_, cx| { ActiveCall::global(cx) .update(cx, |call, cx| call.hang_up(cx)) @@ -213,6 +215,7 @@ impl Render for CollabTitlebarItem { }, ) .style(ButtonStyle::Subtle) + .icon_size(IconSize::Small) .selected(is_muted) .on_click(move |_, cx| crate::toggle_mute(&Default::default(), cx)), ) @@ -226,6 +229,7 @@ impl Render for CollabTitlebarItem { }, ) .style(ButtonStyle::Subtle) + .icon_size(IconSize::Small) .selected(is_deafened) .tooltip(move |cx| { Tooltip::with_meta("Deafen Audio", None, "Mic will be muted", cx) @@ -235,6 +239,7 @@ impl Render for CollabTitlebarItem { .child( IconButton::new("screen-share", ui::Icon::Screen) .style(ButtonStyle::Subtle) + .icon_size(IconSize::Small) .selected(is_screen_sharing) .on_click(move |_, cx| { crate::toggle_screen_sharing(&Default::default(), cx) @@ -313,6 +318,7 @@ impl CollabTitlebarItem { Button::new("project_owner_trigger", host.github_login.clone()) .color(Color::Player(participant_index.0)) .style(ButtonStyle::Subtle) + .label_size(LabelSize::Small) .tooltip(move |cx| Tooltip::text("Toggle following", cx)), ), )