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

Fix inline margins of in flow blocks in 2020

Browse source
This commit is contained in:
Anthony Ramine 2019-11-29 10:07:48 +01:00 • committed by Simon Sapin
parent 48a4a82a49
commit f24e8d0557
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/layout_2020/flow/mod.rs
View file

@ -369,16 +369,13 @@ fn layout_in_flow_non_replaced_block_level<'a>(
*s = LengthOrAuto::LengthPercentage(inline_margins / 2.); *s = LengthOrAuto::LengthPercentage(inline_margins / 2.);
*e = LengthOrAuto::LengthPercentage(inline_margins / 2.); *e = LengthOrAuto::LengthPercentage(inline_margins / 2.);
}, },
(s @ &mut LengthOrAuto::Auto, _) => { (s @ &mut LengthOrAuto::Auto, &mut LengthOrAuto::LengthPercentage(e)) => {
*s = LengthOrAuto::LengthPercentage(inline_margins); *s = LengthOrAuto::LengthPercentage(inline_margins - e);
}, },
(_, e @ &mut LengthOrAuto::Auto) => { (&mut LengthOrAuto::LengthPercentage(s), e) => {
*e = LengthOrAuto::LengthPercentage(inline_margins);
},
(_, e @ _) => {
// Either the inline-end margin is auto, // Either the inline-end margin is auto,
// or we’re over-constrained and we do as if it were. // or we’re over-constrained and we do as if it were.
*e = LengthOrAuto::LengthPercentage(inline_margins); *e = LengthOrAuto::LengthPercentage(inline_margins - s);
}, },
} }
} }