...

2 files changed, 11 insertions, 4 deletions

diff --git a/include/cru/ui/controls/FlexLayout.hpp b/include/cru/ui/controls/FlexLayout.hpp
index beacd1f9..3d6087c2 100644
--- a/include/cru/ui/controls/FlexLayout.hpp
+++ b/include/cru/ui/controls/FlexLayout.hpp
@@ -29,7 +29,7 @@ class FlexLayout : public LayoutControl {
   void SetFlexDirection(FlexDirection direction);
 
   FlexChildLayoutData GetChildLayoutData(Control* control);
-  void SetChildLayoutData(Control* control, const FlexChildLayoutData& data);
+  void SetChildLayoutData(Control* control, FlexChildLayoutData data);
 
  protected:
   void OnAddChild(Control* child, Index position) override;
diff --git a/include/cru/ui/render/LayoutRenderObject.hpp b/include/cru/ui/render/LayoutRenderObject.hpp
index f99eb4ca..1eb9a816 100644
--- a/include/cru/ui/render/LayoutRenderObject.hpp
+++ b/include/cru/ui/render/LayoutRenderObject.hpp
@@ -22,10 +22,17 @@ class LayoutRenderObject : public RenderObject {
     return this->child_layout_data_;
   }
 
-  ChildLayoutData* GetChildLayoutData(Index position) {
+  void SetChildLayoutData(Index position, ChildLayoutData data) {
     Expects(position >= 0 &&
-            position < static_cast<Index>(child_layout_data_.size()));
-    return &child_layout_data_[position];
+            position < static_cast<Index>(this->child_layout_data_.size()));
+    this->child_layout_data_[position] = std::move(data);
+    this->InvalidateLayout();
+  }
+
+  const ChildLayoutData& GetChildLayoutData(Index position) const {
+    Expects(position >= 0 &&
+            position < static_cast<Index>(this->child_layout_data_.size()));
+    return this->child_layout_data_[position];
   }
 
   void Draw(platform::graph::IPainter* painter) override;