fix failing absolute layout testsk

d2b88422bb581ccfd8e1b7a225f51c5a2ac927ec · por Emil Sjölander · 2018-12-04T23:34:41Z (hace 7 años) · padre 6df8c3385 · ver el árbol en este commit

Delta semántico · 1

src/algo.rs

cambió por dentro fn compute_internal

1 archivos · +8 −2

src/algo.rs +8 −2

diff --git a/src/algo.rs b/src/algo.rs
index ba2dd480d..69cc2526e 100644
--- a/src/algo.rs
+++ b/src/algo.rs
@@ -1021,10 +1021,16 @@ fn compute_internal(
 
         let result = compute_internal(
             child,
+            child.width
+                .resolve(f32::NAN, f32::NAN)
+                .min(child.max_width.resolve(f32::NAN, f32::NAN))
+                .max(child.min_width.resolve(f32::NAN, f32::NAN)),
+            child.height
+                .resolve(f32::NAN, f32::NAN)
+                .min(child.max_height.resolve(f32::NAN, f32::NAN))
+                .max(child.min_height.resolve(f32::NAN, f32::NAN)),
             if node.flex_direction.is_row() { main } else { cross },
             if node.flex_direction.is_row() { cross } else { main },
-            if node.flex_direction.is_row() { container_main_size } else { container_cross_size },
-            if node.flex_direction.is_row() { container_cross_size } else { container_main_size },
             percent_calc_base_child,
         );