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

layout: make padding and border use Au in pbm (#31289)

Browse source 
* use au for padding and border in pbm

* review fix
This commit is contained in:
atbrakhi 2024-02-12 23:49:50 +01:00 • committed by GitHub
parent f25fe3539a
commit 8ba251c95f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 168 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -517,7 +517,10 @@ impl<'a> FlexItem<'a> {
let padding = flex_context.sides_to_flex_relative(pbm.padding);
let border = flex_context.sides_to_flex_relative(pbm.border);
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 = FlexRelativeVec2 {
main: padding_border.main.into(),
cross: padding_border.cross.into(),
} + margin_auto_is_zero.sum_by_axis();
let align_self = flex_context.align_for(&box_.style().clone_align_self());
@ -540,8 +543,8 @@ impl<'a> FlexItem<'a> {
content_box_size,
content_min_size,
content_max_size,
padding: padding.map(|t| (*t).into()),
border: border.map(|t| (*t).into()),
padding,
border,
margin,
pbm_auto_is_zero,
flex_base_size,
@ -557,7 +560,7 @@ fn flex_base_size(
flex_item: &mut IndependentFormattingContext,
cross_axis_is_item_block_axis: bool,
content_box_size: FlexRelativeVec2<LengthOrAuto>,
padding_border_sums: FlexRelativeVec2<Length>,
padding_border_sums: FlexRelativeVec2<Au>,
) -> Length {
let used_flex_basis = match &flex_item.style().get_position().flex_basis {
FlexBasis::Content => FlexBasis::Content,
@ -568,7 +571,7 @@ fn flex_base_size(
BoxSizing::BorderBox => {
// This may make `length` negative,
// but it will be clamped in the hypothetical main size
length - padding_border_sums.main
length - padding_border_sums.main.into()
},
}
};