fix min size in flexing

812e02b5d39012fe614bb18966d7aadf06163a31 · ruwaq Emil Sjölander · 2018-12-06T19:00:45Z (7 wata ñawpaq) · tayta 6a48f8bef · kay commitpi sach'ata qhaway

Semántico sayk'uy · 1

src/algo.rs

ukhunpi t'ikrakurqan fn compute_internal

1 qillqakuna · +3 −2

src/algo.rs +3 −2

diff --git a/src/algo.rs b/src/algo.rs
index 140cd7b07..af8e2c721 100644
--- a/src/algo.rs
+++ b/src/algo.rs
@@ -609,7 +609,8 @@ fn compute_internal(
                         percent_calc_base_child,
                     ).size
                     .width
-                    .min(child.node.width.resolve(percent_calc_base_child, f32::MAX))
+                    .min(child.node.width.resolve(percent_calc_base_child, f32::NAN))
+                    .max(child.node.min_width.resolve(percent_calc_base_child, f32::MIN))
                 } else {
                     child.node.min_main_size(node.flex_direction).resolve(percent_calc_base_child, f32::MIN)
                 };
@@ -909,7 +910,7 @@ fn compute_internal(
                 child.node.cross_margin_end(node.flex_direction).resolve(percent_calc_base_child, 0.0);
 
             let free_space = line.cross_size - child.outer_target_cross_size;
-            
+
             if child.node.cross_margin_start(node.flex_direction) == style::Dimension::Auto
                 && child.node.cross_margin_end(node.flex_direction) == style::Dimension::Auto
             {