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

Use Sides::inline_sum method

Browse source
This commit is contained in:
Simon Sapin 2019-12-04 13:39:04 +01:00
parent 77d2c45991
commit 01034b10e1
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/layout_2020/sizing.rs
View file

@ -62,9 +62,9 @@ pub(crate) fn outer_inline_content_sizes_and_percentages(
let inline_size = style.box_size().inline; let inline_size = style.box_size().inline;
// Percentages for 'width' are treated as 'auto' // Percentages for 'width' are treated as 'auto'
let inline_size = specified.map(|lp| lp.as_length()); let inline_size = inline_size.map(|lp| lp.as_length());
// The (inner) min/max-content are only used for 'auto' // The (inner) min/max-content are only used for 'auto'
let mut outer = match specified.non_auto().flatten() { let mut outer = match inline_size.non_auto().flatten() {
None => expect(inner_content_sizes).clone(), None => expect(inner_content_sizes).clone(),
Some(length) => ContentSizes { Some(length) => ContentSizes {
min_content: length, min_content: length,
@ -77,8 +77,7 @@ pub(crate) fn outer_inline_content_sizes_and_percentages(
let padding = style.padding(); let padding = style.padding();
let border = style.border_width(); let border = style.border_width();
let margin = style.margin(); let margin = style.margin();
pbm_lengths += border.inline_start; pbm_lengths += border.inline_sum();
pbm_lengths += border.inline_end;
let mut add = |x: LengthPercentage| { let mut add = |x: LengthPercentage| {
pbm_lengths += x.length_component(); pbm_lengths += x.length_component();
pbm_percentages += x.percentage_component(); pbm_percentages += x.percentage_component();