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

Add back negative margins, now that they're supported again

Browse source
This commit is contained in:
Marshall Bowers 2023-10-09 12:33:30 -04:00
parent a7c4ae530d
commit 19434afe0a
3 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/ui2/src/components/facepile.rs
View file

@ -24,8 +24,7 @@ impl<S: 'static + Send + Sync> Facepile<S> {
let isnt_last = ix < player_count - 1; let isnt_last = ix < player_count - 1;
div() div()
// TODO: Blocked on negative margins. .when(isnt_last, |div| div.neg_mr_1())
// .when(isnt_last, |div| div.neg_mr_1())
.child(Avatar::new(player.avatar_src().to_string())) .child(Avatar::new(player.avatar_src().to_string()))
}); });
div().p_1().flex().items_center().children(player_list) div().p_1().flex().items_center().children(player_list)

7
crates/ui2/src/components/list.rs
View file

@ -377,12 +377,7 @@ impl<S: 'static + Send + Sync + Clone> ListEntry<S> {
match (self.toggle, self.disclosure_control_style) { match (self.toggle, self.disclosure_control_style) {
(Some(_), DisclosureControlVisibility::OnHover) => { (Some(_), DisclosureControlVisibility::OnHover) => {
Some( Some(div().absolute().neg_left_5().child(disclosure_control_icon))
div()
.absolute()
// .neg_left_5()
.child(disclosure_control_icon),
)
} }
(Some(_), DisclosureControlVisibility::Always) => { (Some(_), DisclosureControlVisibility::Always) => {
Some(div().child(disclosure_control_icon)) Some(div().child(disclosure_control_icon))

5
crates/ui2/src/components/player_stack.rs
View file

@ -62,10 +62,7 @@ impl<S: 'static + Send + Sync> PlayerStack<S> {
}) })
.child(Avatar::new(player.avatar_src().to_string())) .child(Avatar::new(player.avatar_src().to_string()))
.children(followers.map(|followers| { .children(followers.map(|followers| {
div() div().neg_ml_2().child(Facepile::new(followers.into_iter()))
// TODO: Blocked on negative margins.
// .neg_ml_2()
.child(Facepile::new(followers.into_iter()))
})), })),
) )
} }