Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Support start and end values for flexbox align-self (#33032)

Browse source 
These are similar to `flex-start` and `flex-end`, but in `wrap-reverse`
situations, they are the opposite.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Co-authored-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
Martin Robinson 2024-08-15 10:20:41 +02:00 • committed by GitHub
parent a6638c1952
commit 8159f03288
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 200 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
components/layout_2020/flexbox/layout.rs
View file

@ -1554,6 +1554,7 @@ impl InitialFlexLineLayout<'_> {
.baseline_relative_to_margin_box
.unwrap_or_default(),
shared_alignment_baseline.unwrap_or_default(),
flex_context.flex_wrap_reverse,
);
let start_corner = FlexRelativeVec2 {
@ -1886,24 +1887,34 @@ impl FlexItem<'_> {
line_cross_size: Au,
propagated_baseline: Au,
max_propagated_baseline: Au,
wrap_reverse: bool,
) -> Au {
let ending_alignment = line_cross_size - *used_cross_size - self.pbm_auto_is_zero.cross;
let outer_cross_start =
if self.margin.cross_start.is_auto() || self.margin.cross_end.is_auto() {
Au::zero()
} else {
match self.align_self.0.value() {
AlignFlags::STRETCH | AlignFlags::FLEX_START => Au::zero(),
AlignFlags::FLEX_END => {
let margin_box_cross = *used_cross_size + self.pbm_auto_is_zero.cross;
line_cross_size - margin_box_cross
},
AlignFlags::CENTER => {
let margin_box_cross = *used_cross_size + self.pbm_auto_is_zero.cross;
(line_cross_size - margin_box_cross) / 2
},
AlignFlags::FLEX_START | AlignFlags::STRETCH => Au::zero(),
AlignFlags::FLEX_END => ending_alignment,
AlignFlags::CENTER => ending_alignment / 2,
AlignFlags::BASELINE | AlignFlags::LAST_BASELINE => {
max_propagated_baseline - propagated_baseline
},
AlignFlags::START => {
if !wrap_reverse {
Au::zero()
} else {
ending_alignment
}
},
AlignFlags::END => {
if !wrap_reverse {
ending_alignment
} else {
Au::zero()
}
},
_ => Au::zero(),
}
};