Fix inline margins of in flow blocks in 2020

servo · Dec 1, 2019 · f24e8d0 · f24e8d0
1 parent 48a4a82
commit f24e8d0
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/components/layout_2020/flow/mod.rs b/components/layout_2020/flow/mod.rs
@@ -369,16 +369,13 @@ fn layout_in_flow_non_replaced_block_level<'a>(
                 *s = 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,
                 // or we’re over-constrained and we do as if it were.
-                *e = LengthOrAuto::LengthPercentage(inline_margins);
+                *e = LengthOrAuto::LengthPercentage(inline_margins - s);
             },
         }
     }