vndangkhoa/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-06-01 03:14:56 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Vertically align avatars with labels in people panel

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld 2021-09-21 15:09:31 -07:00
parent 6d0b84a467
commit b576397610
3 changed files with 66 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gpui/src/elements/align.rs
View file

@ -25,6 +25,11 @@ impl Align {
self
}
pub fn left(mut self) -> Self {
self.alignment.set_x(-1.0);
self
}
pub fn right(mut self) -> Self {
self.alignment.set_x(1.0);
self

8
gpui/src/elements/image.rs
View file

@ -19,13 +19,13 @@ pub struct Image {
#[derive(Copy, Clone, Default, Deserialize)]
pub struct ImageStyle {
#[serde(default)]
border: Border,
pub border: Border,
#[serde(default)]
corner_radius: f32,
pub corner_radius: f32,
#[serde(default)]
height: Option<f32>,
pub height: Option<f32>,
#[serde(default)]
width: Option<f32>,
pub width: Option<f32>,
}
impl Image {

88
zed/src/people_panel.rs
View file

@ -74,6 +74,16 @@ impl PeoplePanel {
let cap_height = theme.unshared_worktree.text.cap_height(font_cache);
let baseline_offset = theme.unshared_worktree.text.baseline_offset(font_cache);
let tree_branch = theme.tree_branch;
let host_avatar_height = theme
.host_avatar
.width
.or(theme.host_avatar.height)
.unwrap_or(0.);
let guest_avatar_height = theme
.guest_avatar
.width
.or(theme.guest_avatar.height)
.unwrap_or(0.);
Flex::column()
.with_child(
@ -86,15 +96,23 @@ impl PeoplePanel {
.map(|avatar| Image::new(avatar).with_style(theme.host_avatar).boxed()),
)
.with_child(
Container::new(
Label::new(
collaborator.user.github_login.clone(),
theme.host_username.text.clone(),
ConstrainedBox::new(
Align::new(
Container::new(
Label::new(
collaborator.user.github_login.clone(),
theme.host_username.text.clone(),
)
.boxed(),
)
.with_style(theme.host_username.container)
.boxed()
)
.boxed(),
.left()
.boxed()
)
.with_style(theme.host_username.container)
.boxed(),
.with_height(host_avatar_height)
.boxed()
)
.boxed(),
)
@ -171,33 +189,41 @@ impl PeoplePanel {
&theme.unshared_worktree
};
Flex::row()
.with_child(
Container::new(
Label::new(
worktree.root_name.clone(),
style.text.clone(),
)
.boxed(),
)
.with_style(style.container)
.boxed(),
)
.with_children(worktree.guests.iter().filter_map(
|participant| {
participant.avatar.clone().map(|avatar| {
Container::new(
Image::new(avatar)
.with_style(theme.guest_avatar)
Container::new(
Flex::row()
.with_child(
ConstrainedBox::new(
Align::new(
Label::new(
worktree.root_name.clone(),
style.text.clone(),
)
.boxed(),
)
.left()
.boxed()
)
.with_margin_left(
theme.guest_avatar_spacing,
)
.with_height(guest_avatar_height)
.boxed()
})
},
))
)
.with_children(worktree.guests.iter().filter_map(
|participant| {
participant.avatar.clone().map(|avatar| {
Container::new(
Image::new(avatar)
.with_style(theme.guest_avatar)
.boxed(),
)
.with_margin_left(
theme.guest_avatar_spacing,
)
.boxed()
})
},
))
.boxed()
)
.with_style(style.container)
.boxed()
},
);