tawasuyu

tawasuyu/taffy

A high performance rust-powered UI layout library

HTML 229Rust 8TOML 3CSS 1310 Sutichaykuna

Fix copy paste error

daf0df71e39e601f86c187113da529bbd081b14e · ruwaq Emil Sjölander · (7 wata ñawpaq) · tayta 9641b26a6 · kay commitpi sach'ata qhaway

Semántico sayk'uy · 1

src/algo.rs

1 qillqakuna · +18 −18

diff --git a/src/algo.rs b/src/algo.rs
index 161a7aff6..75fcf9efa 100644
--- a/src/algo.rs
+++ b/src/algo.rs
@@ -293,15 +293,15 @@ fn compute_internal(
                 child
                     .node
                     .width
-                    .resolve(f32::NAN, f32::NAN)
-                    .min(child.node.max_width.resolve(f32::NAN, f32::NAN))
-                    .max(child.node.min_width.resolve(f32::NAN, f32::NAN)),
+                    .resolve(percent_calc_base_child, f32::NAN)
+                    .min(child.node.max_width.resolve(percent_calc_base_child, f32::NAN))
+                    .max(child.node.min_width.resolve(percent_calc_base_child, f32::NAN)),
                 child
                     .node
                     .height
-                    .resolve(f32::NAN, f32::NAN)
-                    .min(child.node.max_height.resolve(f32::NAN, f32::NAN))
-                    .max(child.node.min_height.resolve(f32::NAN, f32::NAN)),
+                    .resolve(percent_calc_base_child, f32::NAN)
+                    .min(child.node.max_height.resolve(percent_calc_base_child, f32::NAN))
+                    .max(child.node.min_height.resolve(percent_calc_base_child, f32::NAN)),
                 if node.flex_direction.is_row() { available_main } else { available_cross },
                 if node.flex_direction.is_row() { available_cross } else { available_main },
                 percent_calc_base_child,
@@ -322,15 +322,15 @@ fn compute_internal(
             child
                 .node
                 .width
-                .resolve(f32::NAN, f32::NAN)
-                .min(child.node.max_width.resolve(f32::NAN, f32::NAN))
-                .max(child.node.min_width.resolve(f32::NAN, f32::NAN)),
+                .resolve(percent_calc_base_child, f32::NAN)
+                .min(child.node.max_width.resolve(percent_calc_base_child, f32::NAN))
+                .max(child.node.min_width.resolve(percent_calc_base_child, f32::NAN)),
             child
                 .node
                 .height
-                .resolve(f32::NAN, f32::NAN)
-                .min(child.node.max_height.resolve(f32::NAN, f32::NAN))
-                .max(child.node.min_height.resolve(f32::NAN, f32::NAN)),
+                .resolve(percent_calc_base_child, f32::NAN)
+                .min(child.node.max_height.resolve(percent_calc_base_child, f32::NAN))
+                .max(child.node.min_height.resolve(percent_calc_base_child, f32::NAN)),
             if node.flex_direction.is_row() { available_main } else { available_cross },
             if node.flex_direction.is_row() { available_cross } else { available_main },
             percent_calc_base_child,
@@ -1023,14 +1023,14 @@ fn 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)),
+                .resolve(percent_calc_base_child, f32::NAN)
+                .min(child.max_width.resolve(percent_calc_base_child, f32::NAN))
+                .max(child.min_width.resolve(percent_calc_base_child, 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)),
+                .resolve(percent_calc_base_child, f32::NAN)
+                .min(child.max_height.resolve(percent_calc_base_child, f32::NAN))
+                .max(child.min_height.resolve(percent_calc_base_child, f32::NAN)),
             if node.flex_direction.is_row() { main } else { cross },
             if node.flex_direction.is_row() { cross } else { main },
             percent_calc_base_child,