Account for margin when stretching

df0293601bd86142690ca9512b7f034ea1628a96 · por Emil Sjölander · 2018-12-05T17:39:46Z (hace 7 años) · padre d529f0110 · ver el árbol en este commit

Delta semántico · 1

src/algo.rs

cambió por dentro fn compute_internal

1 archivos · +3 −1

src/algo.rs +3 −1

diff --git a/src/algo.rs b/src/algo.rs
index 273ee2bef..fd160ec2f 100644
--- a/src/algo.rs
+++ b/src/algo.rs
@@ -733,7 +733,9 @@ fn compute_internal(
                 && child.node.cross_margin_end(node.flex_direction) != style::Dimension::Auto
                 && child.node.cross_size(node.flex_direction) == style::Dimension::Auto
             {
-                line.cross_size
+                (line.cross_size
+                    - child.node.cross_margin_start(node.flex_direction).resolve(percent_calc_base_child, 0.0)
+                    - child.node.cross_margin_end(node.flex_direction).resolve(percent_calc_base_child, 0.0))
                     .max(child.node.min_cross_size(node.flex_direction).resolve(percent_calc_base_child, f32::MIN))
                     .min(child.node.max_cross_size(node.flex_direction).resolve(percent_calc_base_child, f32::MAX))
             } else {