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

flexbox 2020: Respect the stretchiness of align-self

Browse source
This commit is contained in:
Manish Goregaokar 2020-07-20 13:38:11 -07:00
parent 1af5efc542
commit d1b92b68c7
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -69,6 +69,8 @@ struct FlexItem<'a> {
/// https://drafts.csswg.org/css-flexbox/#algo-main-item /// https://drafts.csswg.org/css-flexbox/#algo-main-item
hypothetical_main_size: Length, hypothetical_main_size: Length,
/// This is `align-self`, defaulting to `align-items` if `auto`
align_self: AlignItems,
} }
/// A flex line with some intermediate results /// A flex line with some intermediate results
@ -436,6 +438,8 @@ impl<'a> FlexItem<'a> {
let padding_border = padding.sum_by_axis() + border.sum_by_axis(); let padding_border = padding.sum_by_axis() + border.sum_by_axis();
let pbm_auto_is_zero = padding_border + margin_auto_is_zero.sum_by_axis(); let pbm_auto_is_zero = padding_border + margin_auto_is_zero.sum_by_axis();
let align_self = flex_context.align_for(&box_style.clone_align_self());
let flex_base_size = flex_base_size( let flex_base_size = flex_base_size(
flex_context, flex_context,
box_, box_,
@ -459,6 +463,7 @@ impl<'a> FlexItem<'a> {
pbm_auto_is_zero, pbm_auto_is_zero,
flex_base_size, flex_base_size,
hypothetical_main_size, hypothetical_main_size,
align_self,
} }
} }
} }
@ -641,15 +646,14 @@ impl FlexLine<'_> {
// Determine the used cross size of each flex item // Determine the used cross size of each flex item
// https://drafts.csswg.org/css-flexbox/#algo-stretch // https://drafts.csswg.org/css-flexbox/#algo-stretch
// FIXME: For now we hard-code the behavior for `align-self: stretch`
let (item_used_cross_sizes, item_fragments): (Vec<_>, Vec<_>) = self let (item_used_cross_sizes, item_fragments): (Vec<_>, Vec<_>) = self
.items .items
.iter_mut() .iter_mut()
.zip(item_layout_results) .zip(item_layout_results)
.zip(&item_used_main_sizes) .zip(&item_used_main_sizes)
.map(|((item, mut item_result), &used_main_size)| { .map(|((item, mut item_result), &used_main_size)| {
let has_stretch_auto = true; // FIXME: use the property let has_stretch = item.align_self == AlignItems::Stretch;
let cross_size = if has_stretch_auto && let cross_size = if has_stretch &&
item.content_box_size.cross.is_auto() && item.content_box_size.cross.is_auto() &&
!(item.margin.cross_start.is_auto() || item.margin.cross_end.is_auto()) !(item.margin.cross_start.is_auto() || item.margin.cross_end.is_auto())
{ {
@ -660,7 +664,7 @@ impl FlexLine<'_> {
} else { } else {
item_result.hypothetical_cross_size item_result.hypothetical_cross_size
}; };
if has_stretch_auto { if has_stretch {
// “If the flex item has `align-self: stretch`, redo layout for its contents, // “If the flex item has `align-self: stretch`, redo layout for its contents,
// treating this used size as its definite cross size // treating this used size as its definite cross size
// so that percentage-sized children can be resolved.” // so that percentage-sized children can be resolved.”