Merge pull request #13 from crupest/12-layout

Fix issue 12 layout problem.

1 files changed, 19 insertions, 0 deletions

diff --git a/src/ui/controls/linear_layout.cpp b/src/ui/controls/linear_layout.cpp
index f21a9933..3789b305 100644
--- a/src/ui/controls/linear_layout.cpp
+++ b/src/ui/controls/linear_layout.cpp
@@ -89,9 +89,28 @@ namespace cru::ui::controls
         }
 
         if (orientation_ == Orientation::Horizontal)
+        {
+            for (auto control : GetChildren())
+            {
+                if (control->GetLayoutParams()->height.mode == MeasureMode::Stretch)
+                {
+                    control->SetDesiredSize(Size(control->GetDesiredSize().width, secondary_side_child_max_length));
+                }
+            }
             actual_size_for_children.height = secondary_side_child_max_length;
+        }
         else
+        {
+            for (auto control : GetChildren())
+            {
+                if (control->GetLayoutParams()->width.mode == MeasureMode::Stretch)
+                {
+                    control->SetDesiredSize(Size(secondary_side_child_max_length, control->GetDesiredSize().height));
+                }
+            }
+
             actual_size_for_children.width = secondary_side_child_max_length;
+        }
 
         return actual_size_for_children;
     }