mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Fix various issues with replaced elements in flex layout (#33263)
In particular, this takes into account that flex items may be stretched, and if they have an aspect ratio, we ma6y need to convert the stretched size through the ratio. Signed-off-by: Oriol Brufau <obrufau@igalia.com> Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
parent
4ae2610c24
commit
3acc9edd82
43 changed files with 334 additions and 481 deletions
|
@ -111,6 +111,7 @@ pub(crate) fn outer_inline(
|
|||
style: &ComputedValues,
|
||||
containing_block: &IndefiniteContainingBlock,
|
||||
auto_minimum: &LogicalVec2<Au>,
|
||||
auto_block_size_stretches_to_containing_block: bool,
|
||||
get_content_size: impl FnOnce(&IndefiniteContainingBlock) -> ContentSizes,
|
||||
) -> ContentSizes {
|
||||
let (content_box_size, content_min_size, content_max_size, pbm) =
|
||||
|
@ -119,18 +120,23 @@ pub(crate) fn outer_inline(
|
|||
inline: content_min_size.inline.auto_is(|| auto_minimum.inline),
|
||||
block: content_min_size.block.auto_is(|| auto_minimum.block),
|
||||
};
|
||||
let pbm_inline_sum = pbm.padding_border_sums.inline +
|
||||
pbm.margin.inline_start.auto_is(Au::zero) +
|
||||
pbm.margin.inline_end.auto_is(Au::zero);
|
||||
let margin = pbm.margin.map(|v| v.auto_is(Au::zero));
|
||||
let pbm_inline_sum = pbm.padding_border_sums.inline + margin.inline_sum();
|
||||
let adjust = |v: Au| {
|
||||
v.clamp_between_extremums(content_min_size.inline, content_max_size.inline) + pbm_inline_sum
|
||||
};
|
||||
match content_box_size.inline {
|
||||
AuOrAuto::LengthPercentage(inline_size) => adjust(inline_size).into(),
|
||||
AuOrAuto::Auto => {
|
||||
let block_size = content_box_size
|
||||
.block
|
||||
.map(|v| v.clamp_between_extremums(content_min_size.block, content_max_size.block));
|
||||
let block_size = if content_box_size.block.is_auto() &&
|
||||
auto_block_size_stretches_to_containing_block
|
||||
{
|
||||
let outer_block_size = containing_block.size.block;
|
||||
outer_block_size.map(|v| v - pbm.padding_border_sums.block - margin.block_sum())
|
||||
} else {
|
||||
content_box_size.block
|
||||
}
|
||||
.map(|v| v.clamp_between_extremums(content_min_size.block, content_max_size.block));
|
||||
let containing_block_for_children =
|
||||
IndefiniteContainingBlock::new_for_style_and_block_size(style, block_size);
|
||||
get_content_size(&containing_block_for_children).map(adjust)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue