From eb09295dc4f21bfed0dee042a115d9847c5f477e Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cory.forsstrom@lich.io>
Date: Tue, 14 Sep 2021 10:38:02 -0700
Subject: [PATCH] Calc fill cross and use for all children

---
 native/src/layout/flex.rs | 84 +++++++++++++++++++++++++--------------
 1 file changed, 55 insertions(+), 29 deletions(-)

diff --git a/native/src/layout/flex.rs b/native/src/layout/flex.rs
index 17045e69af..2f75fee14c 100644
--- a/native/src/layout/flex.rs
+++ b/native/src/layout/flex.rs
@@ -76,16 +76,38 @@ where
     let max_cross = axis.cross(limits.max());
 
     let mut fill_sum = 0;
-    let mut cross = if align_items == Align::Fill {
-        axis.cross(limits.min())
-    } else {
-        axis.cross(limits.min()).max(axis.cross(limits.fill()))
-    };
+    let mut cross = axis.cross(limits.min()).max(axis.cross(limits.fill()));
     let mut available = axis.main(limits.max()) - total_spacing;
 
     let mut nodes: Vec<Node> = Vec::with_capacity(items.len());
     nodes.resize(items.len(), Node::default());
 
+    if align_items == Align::Fill {
+        let mut fill_cross = axis.cross(limits.min());
+
+        items.iter().for_each(|child| {
+            let cross_fill_factor = match axis {
+                Axis::Horizontal => child.height(),
+                Axis::Vertical => child.width(),
+            }
+            .fill_factor();
+
+            if cross_fill_factor == 0 {
+                let (max_width, max_height) = axis.pack(available, max_cross);
+
+                let child_limits =
+                    Limits::new(Size::ZERO, Size::new(max_width, max_height));
+
+                let layout = child.layout(renderer, &child_limits);
+                let size = layout.size();
+
+                fill_cross = fill_cross.max(axis.cross(size));
+            }
+        });
+
+        cross = fill_cross;
+    }
+
     for (i, child) in items.iter().enumerate() {
         let fill_factor = match axis {
             Axis::Horizontal => child.width(),
@@ -93,35 +115,39 @@ where
         }
         .fill_factor();
 
-        let cross_fill_factor = match axis {
-            Axis::Horizontal => child.height(),
-            Axis::Vertical => child.width(),
-        }
-        .fill_factor();
-
-        if align_items != Align::Fill && fill_factor != 0 {
-            fill_sum += fill_factor;
-
-            continue;
-        }
-
-        let (max_width, max_height) = axis.pack(available, max_cross);
+        if fill_factor == 0 {
+            let (min_width, min_height) = axis.pack(
+                0.0,
+                if align_items == Align::Fill {
+                    cross
+                } else {
+                    0.0
+                },
+            );
 
-        let child_limits =
-            Limits::new(Size::ZERO, Size::new(max_width, max_height));
+            let (max_width, max_height) = axis.pack(
+                available,
+                if align_items == Align::Fill {
+                    cross
+                } else {
+                    max_cross
+                },
+            );
 
-        let layout = child.layout(renderer, &child_limits);
-        let size = layout.size();
+            let child_limits = Limits::new(
+                Size::new(min_width, min_height),
+                Size::new(max_width, max_height),
+            );
 
-        if align_items != Align::Fill
-            || cross_fill_factor == 0 && align_items == Align::Fill
-        {
-            cross = cross.max(axis.cross(size));
-        }
+            let layout = child.layout(renderer, &child_limits);
+            let size = layout.size();
 
-        if fill_factor == 0 {
             available -= axis.main(size);
 
+            if align_items != Align::Fill {
+                cross = cross.max(axis.cross(size));
+            }
+
             nodes[i] = layout;
         } else {
             fill_sum += fill_factor;
@@ -159,7 +185,7 @@ where
                 if align_items == Align::Fill {
                     cross
                 } else {
-                    axis.cross(limits.max())
+                    max_cross
                 },
             );