From b72e4b0caf54ff8434eb8413d7be588d31ab9963 Mon Sep 17 00:00:00 2001
From: Jonathan Johnson <jon@khonsulabs.com>
Date: Tue, 14 Nov 2023 07:59:13 -0800
Subject: [PATCH] Optimizing Stack layout in Known dimensions

---
 src/widgets/stack.rs | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/widgets/stack.rs b/src/widgets/stack.rs
index 4eb0172..92feb66 100644
--- a/src/widgets/stack.rs
+++ b/src/widgets/stack.rs
@@ -400,6 +400,11 @@ impl Layout {
         let allocated_space =
             self.allocated_space.0 + self.allocated_space.1.into_px(scale).into_unsigned();
         let mut remaining = available_space.saturating_sub(allocated_space);
+        // If our `other_constraint` is not known, we will need to give child
+        // widgets an opportunity to lay themselves out in the full area. This
+        // requires one extra layout call, so we avoid persisting layouts during
+        // the first loop if this is the case.
+        let needs_final_layout = !matches!(other_constraint, ConstraintLimit::Known(_));
 
         // Measure the children that fit their content
         self.other = UPx(0);
@@ -409,7 +414,7 @@ impl Layout {
                 index,
                 self.orientation
                     .make_size(ConstraintLimit::ClippedAfter(remaining), other_constraint),
-                false,
+                !needs_final_layout,
             ));
             self.layouts[index].size = measured;
             self.other = self.other.max(other);
@@ -450,7 +455,7 @@ impl Layout {
                         ),
                         other_constraint,
                     ),
-                    true,
+                    !needs_final_layout,
                 ));
                 self.other = self.other.max(measured);
             }
@@ -461,19 +466,23 @@ impl Layout {
             ConstraintLimit::ClippedAfter(clip_limit) => self.other.min(clip_limit),
         };
 
-        // Finally layout the widgets with the final constraints
+        // Finally, compute the offsets of all of the widgets.
         let mut offset = UPx(0);
         for index in 0..self.children.len() {
             self.layouts[index].offset = offset;
             offset += self.layouts[index].size;
-            self.orientation.split_size(measure(
-                index,
-                self.orientation.make_size(
-                    ConstraintLimit::Known(self.layouts[index].size.into_px(scale).into_unsigned()),
-                    ConstraintLimit::Known(self.other),
-                ),
-                true,
-            ));
+            if needs_final_layout {
+                self.orientation.split_size(measure(
+                    index,
+                    self.orientation.make_size(
+                        ConstraintLimit::Known(
+                            self.layouts[index].size.into_px(scale).into_unsigned(),
+                        ),
+                        ConstraintLimit::Known(self.other),
+                    ),
+                    true,
+                ));
+            }
         }
 
         self.orientation.make_size(offset, self.other)