Make follower avatars smaller (#6724)
This PR makes the avatars of followers in a facepile smaller than the leader's avatar. <img width="227" alt="Screenshot 2024-01-25 at 1 42 14 PM" src="https://github.com/zed-industries/zed/assets/1486634/defc22b4-4ae1-4d63-a0d8-53e3ca8cce04"> Release Notes: - Adjusted the size of follower avatars to be smaller than the leader. Co-authored-by: Conrad <conrad@zed.dev>
This commit is contained in:
parent
e9edad1d51
commit
6103f67875
3 changed files with 13 additions and 9 deletions
|
@ -343,9 +343,11 @@ impl ChatPanel {
|
||||||
this.pt_3().child(
|
this.pt_3().child(
|
||||||
h_flex()
|
h_flex()
|
||||||
.text_ui_sm()
|
.text_ui_sm()
|
||||||
.child(div().absolute().child(
|
.child(
|
||||||
Avatar::new(message.sender.avatar_uri.clone()).size(cx.rem_size()),
|
div().absolute().child(
|
||||||
))
|
Avatar::new(message.sender.avatar_uri.clone()).size(rems(1.)),
|
||||||
|
),
|
||||||
|
)
|
||||||
.child(
|
.child(
|
||||||
div()
|
div()
|
||||||
.pl(cx.rem_size() + px(6.0))
|
.pl(cx.rem_size() + px(6.0))
|
||||||
|
|
|
@ -542,7 +542,9 @@ impl CollabTitlebarItem {
|
||||||
})?
|
})?
|
||||||
.clone();
|
.clone();
|
||||||
|
|
||||||
Some(Avatar::new(follower.avatar_uri.clone()))
|
Some(div().mt(-px(4.)).child(
|
||||||
|
Avatar::new(follower.avatar_uri.clone()).size(rems(0.75)),
|
||||||
|
))
|
||||||
},
|
},
|
||||||
))
|
))
|
||||||
.children(if extra_count > 0 {
|
.children(if extra_count > 0 {
|
||||||
|
|
|
@ -27,7 +27,7 @@ pub enum AvatarShape {
|
||||||
#[derive(IntoElement)]
|
#[derive(IntoElement)]
|
||||||
pub struct Avatar {
|
pub struct Avatar {
|
||||||
image: Img,
|
image: Img,
|
||||||
size: Option<Pixels>,
|
size: Option<AbsoluteLength>,
|
||||||
border_color: Option<Hsla>,
|
border_color: Option<Hsla>,
|
||||||
indicator: Option<AnyElement>,
|
indicator: Option<AnyElement>,
|
||||||
}
|
}
|
||||||
|
@ -82,8 +82,8 @@ impl Avatar {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Size overrides the avatar size. By default they are 1rem.
|
/// Size overrides the avatar size. By default they are 1rem.
|
||||||
pub fn size(mut self, size: impl Into<Option<Pixels>>) -> Self {
|
pub fn size<L: Into<AbsoluteLength>>(mut self, size: impl Into<Option<L>>) -> Self {
|
||||||
self.size = size.into();
|
self.size = size.into().map(Into::into);
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -105,8 +105,8 @@ impl RenderOnce for Avatar {
|
||||||
px(0.)
|
px(0.)
|
||||||
};
|
};
|
||||||
|
|
||||||
let image_size = self.size.unwrap_or_else(|| cx.rem_size());
|
let image_size = self.size.unwrap_or_else(|| rems(1.).into());
|
||||||
let container_size = image_size + border_width * 2.;
|
let container_size = image_size.to_pixels(cx.rem_size()) + border_width * 2.;
|
||||||
|
|
||||||
div()
|
div()
|
||||||
.size(container_size)
|
.size(container_size)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue