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

WIP: Add face to right hand menu

Browse source
This commit is contained in:
Mikayla Maki 2023-06-09 09:00:38 -07:00
parent aac71fdcfe
commit 47ef800dc6
No known key found for this signature in database
1 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,10 +92,10 @@ impl View for CollabTitlebarItem {
let status = workspace.read(cx).client().status(); let status = workspace.read(cx).client().status();
let status = &*status.borrow(); let status = &*status.borrow();
if matches!(status, client::Status::Connected { .. }) { if matches!(status, client::Status::Connected { .. }) {
right_container.add_child(self.render_toggle_contacts_button(&theme, cx)); right_container.add_child(self.render_toggle_contacts_button(&theme, cx));
right_container.add_child(self.render_user_menu_button(&theme, cx)); let avatar = user.as_ref().map(|user| user.avatar.clone()).flatten();
right_container.add_child(self.render_user_menu_button(&theme, avatar, cx));
} else { } else {
right_container.add_children(self.render_connection_status(status, cx)); right_container.add_children(self.render_connection_status(status, cx));
right_container.add_child(self.render_sign_in_button(&theme, cx)); right_container.add_child(self.render_sign_in_button(&theme, cx));
@ -504,24 +504,31 @@ impl CollabTitlebarItem {
fn render_user_menu_button( fn render_user_menu_button(
&self, &self,
theme: &Theme, theme: &Theme,
avatar: Option<Arc<ImageData>>,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> AnyElement<Self> { ) -> AnyElement<Self> {
let titlebar = &theme.workspace.titlebar; let titlebar = &theme.workspace.titlebar;
let avatar_style = &theme.workspace.titlebar.leader_avatar;
Stack::new() Stack::new()
.with_child( .with_child(
MouseEventHandler::<ToggleUserMenu, Self>::new(0, cx, |state, _| { MouseEventHandler::<ToggleUserMenu, Self>::new(0, cx, |state, _| {
let style = titlebar.call_control.style_for(state, false); let style = titlebar.call_control.style_for(state, false);
Svg::new("icons/ellipsis_14.svg")
.with_color(style.color) if let Some(avatar_img) = avatar {
.constrained() Self::render_face(avatar_img, *avatar_style, Color::transparent_black())
.with_width(style.icon_width) } else {
.aligned() Svg::new("icons/ellipsis_14.svg")
.constrained() .with_color(style.color)
.with_width(style.button_width) .constrained()
.with_height(style.button_width) .with_width(style.icon_width)
.contained() .aligned()
.with_style(style.container) .constrained()
.with_width(style.button_width)
.with_height(style.button_width)
.contained()
.with_style(style.container)
.into_any()
}
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, this, cx| { .on_click(MouseButton::Left, move |_, this, cx| {