...

5 files changed, 38 insertions, 39 deletions

diff --git a/src/ui/render/border_render_object.cpp b/src/ui/render/border_render_object.cpp
index 6af76b32..2ca55f4d 100644
--- a/src/ui/render/border_render_object.cpp
+++ b/src/ui/render/border_render_object.cpp
@@ -21,10 +21,10 @@ void BorderRenderObject::Draw(platform::graph::Painter* painter) {
     painter->FillGeometry(border_inner_geometry_.get(),
                           background_brush_.get());
   if (is_border_enabled_) {
-    if (border_style_.brush == nullptr) {
+    if (border_brush_ == nullptr) {
       log::Warn(L"Border is enabled but brush is null");
     } else {
-      painter->FillGeometry(geometry_.get(), border_style_.brush.get());
+      painter->FillGeometry(geometry_.get(), border_brush_.get());
     }
   }
   if (const auto child = GetChild()) {
@@ -64,11 +64,6 @@ RenderObject* BorderRenderObject::HitTest(const Point& point) {
   }
 }
 
-void BorderRenderObject::OnSizeChanged(const Size& old_size,
-                                       const Size& new_size) {
-  RecreateGeometry();
-}
-
 void BorderRenderObject::OnMeasureCore(const Size& available_size) {
   const auto margin = GetMargin();
   const auto padding = GetPadding();
@@ -78,9 +73,9 @@ void BorderRenderObject::OnMeasureCore(const Size& available_size) {
 
   if (is_border_enabled_) {
     margin_border_padding_size.width +=
-        border_style_.thickness.GetHorizontalTotal();
+        border_thickness_.GetHorizontalTotal();
     margin_border_padding_size.height +=
-        border_style_.thickness.GetVerticalTotal();
+        border_thickness_.GetVerticalTotal();
   }
 
   auto coerced_margin_border_padding_size = margin_border_padding_size;
@@ -115,9 +110,9 @@ void BorderRenderObject::OnLayoutCore(const Rect& rect) {
 
   if (is_border_enabled_) {
     margin_border_padding_size.width +=
-        border_style_.thickness.GetHorizontalTotal();
+        border_thickness_.GetHorizontalTotal();
     margin_border_padding_size.height +=
-        border_style_.thickness.GetVerticalTotal();
+        border_thickness_.GetVerticalTotal();
   }
 
   const auto content_available_size =
@@ -138,9 +133,9 @@ void BorderRenderObject::OnLayoutCore(const Rect& rect) {
   }
 
   OnLayoutContent(Rect{
-      margin.left + (is_border_enabled_ ? border_style_.thickness.left : 0) +
+      margin.left + (is_border_enabled_ ? border_thickness_.left : 0) +
           padding.left,
-      margin.top + (is_border_enabled_ ? border_style_.thickness.top : 0) +
+      margin.top + (is_border_enabled_ ? border_thickness_.top : 0) +
           padding.top,
       coerced_content_available_size.width,
       coerced_content_available_size.height});
@@ -163,6 +158,10 @@ void BorderRenderObject::OnLayoutContent(const Rect& content_rect) {
   }
 }
 
+void BorderRenderObject::OnAfterLayout() {
+  RecreateGeometry();
+}
+
 void BorderRenderObject::RecreateGeometry() {
   geometry_.reset();
   border_outer_geometry_.reset();
@@ -197,20 +196,20 @@ void BorderRenderObject::RecreateGeometry() {
   const auto graph_factory = platform::graph::GraphFactory::GetInstance();
   std::unique_ptr<platform::graph::GeometryBuilder> builder{
       graph_factory->CreateGeometryBuilder()};
-  f(builder.get(), outer_rect, border_style_.corner_radius);
+  f(builder.get(), outer_rect, border_radius_);
   border_outer_geometry_.reset(builder->Build());
   builder.reset();
 
-  const Rect inner_rect = outer_rect.Shrink(border_style_.thickness);
+  const Rect inner_rect = outer_rect.Shrink(border_thickness_);
 
   builder.reset(graph_factory->CreateGeometryBuilder());
-  f(builder.get(), inner_rect, border_style_.corner_radius);
+  f(builder.get(), inner_rect, border_radius_);
   border_inner_geometry_.reset(builder->Build());
   builder.reset();
 
   builder.reset(graph_factory->CreateGeometryBuilder());
-  f(builder.get(), outer_rect, border_style_.corner_radius);
-  f(builder.get(), inner_rect, border_style_.corner_radius);
+  f(builder.get(), outer_rect, border_radius_);
+  f(builder.get(), inner_rect, border_radius_);
   geometry_.reset(builder->Build());
   builder.reset();
 }
diff --git a/src/ui/render/flex_layout_render_object.cpp b/src/ui/render/flex_layout_render_object.cpp
index 416f39bd..a16aec69 100644
--- a/src/ui/render/flex_layout_render_object.cpp
+++ b/src/ui/render/flex_layout_render_object.cpp
@@ -11,13 +11,6 @@ FlexLayoutRenderObject::FlexLayoutRenderObject() {
   SetChildMode(ChildMode::Multiple);
 }
 
-FlexChildLayoutData* FlexLayoutRenderObject::GetChildLayoutData(int position) {
-  assert(position >= 0 &&
-         position < child_layout_data_.size());  // Position out of bound.
-
-  return &child_layout_data_[position];
-}
-
 void FlexLayoutRenderObject::Draw(platform::graph::Painter* painter) {
   for (const auto child : GetChildren()) {
     auto offset = child->GetOffset();
diff --git a/src/ui/render/render_object.cpp b/src/ui/render/render_object.cpp
index dcd2f0b9..118c68c4 100644
--- a/src/ui/render/render_object.cpp
+++ b/src/ui/render/render_object.cpp
@@ -54,8 +54,6 @@ void RenderObject::OnRemoveChild(RenderObject* removed_child, int position) {
   InvalidatePaint();
 }
 
-void RenderObject::OnSizeChanged(const Size& old_size, const Size& new_size) {}
-
 void RenderObject::OnMeasureCore(const Size& available_size) {
   Size margin_padding_size{
       margin_.GetHorizontalTotal() + padding_.GetHorizontalTotal(),
@@ -108,6 +106,8 @@ void RenderObject::OnLayoutCore(const Rect& rect) {
                        coerced_content_available_size.height});
 }
 
+void RenderObject::OnAfterLayout() {}
+
 Rect RenderObject::GetContentRect() const {
   Rect rect{Point{}, GetSize()};
   rect = rect.Shrink(GetMargin());
@@ -122,4 +122,11 @@ void RenderObject::SetParent(RenderObject* new_parent) {
   parent_ = new_parent;
   OnParentChanged(old_parent, new_parent);
 }
+
+void RenderObject::NotifyAfterLayoutRecursive(RenderObject* render_object) {
+  render_object->OnAfterLayout();
+  for (const auto o : render_object->GetChildren()) {
+    NotifyAfterLayoutRecursive(o);
+  }
+}
 }  // namespace cru::ui::render
diff --git a/src/ui/render/text_render_object.cpp b/src/ui/render/text_render_object.cpp
index 49d7bcb4..a21dc028 100644
--- a/src/ui/render/text_render_object.cpp
+++ b/src/ui/render/text_render_object.cpp
@@ -1,8 +1,8 @@
 #include "cru/ui/render/text_render_object.hpp"
 
 #include "cru/platform/graph/graph_factory.hpp"
-#include "cru/platform/graph/util/painter_util.hpp"
 #include "cru/platform/graph/text_layout.hpp"
+#include "cru/platform/graph/util/painter_util.hpp"
 
 #include <algorithm>
 #include <cassert>
@@ -34,13 +34,11 @@ void TextRenderObject::SetText(std::wstring new_text) {
   text_layout_->SetText(std::move(new_text));
 }
 
-std::shared_ptr<platform::graph::Font> TextRenderObject::GetFont()
-    const {
+std::shared_ptr<platform::graph::Font> TextRenderObject::GetFont() const {
   return text_layout_->GetFont();
 }
 
-void TextRenderObject::SetFont(
-    std::shared_ptr<platform::graph::Font> font) {
+void TextRenderObject::SetFont(std::shared_ptr<platform::graph::Font> font) {
   text_layout_->SetFont(std::move(font));
 }
 
@@ -71,13 +69,6 @@ RenderObject* TextRenderObject::HitTest(const Point& point) {
              : nullptr;
 }
 
-void TextRenderObject::OnSizeChanged(const Size& old_size,
-                                     const Size& new_size) {
-  const auto&& size = GetContentRect().GetSize();
-  text_layout_->SetMaxWidth(size.width);
-  text_layout_->SetMaxHeight(size.height);
-}
-
 Size TextRenderObject::OnMeasureContent(const Size& available_size) {
   text_layout_->SetMaxWidth(available_size.width);
   text_layout_->SetMaxHeight(available_size.height);
@@ -85,4 +76,11 @@ Size TextRenderObject::OnMeasureContent(const Size& available_size) {
 }
 
 void TextRenderObject::OnLayoutContent(const Rect& content_rect) {}
+
+void TextRenderObject::OnAfterLayout() {
+  const auto&& size = GetContentRect().GetSize();
+  text_layout_->SetMaxWidth(size.width);
+  text_layout_->SetMaxHeight(size.height);
+}
+
 }  // namespace cru::ui::render
diff --git a/src/ui/render/window_render_object.cpp b/src/ui/render/window_render_object.cpp
index e2e96897..64bec1e7 100644
--- a/src/ui/render/window_render_object.cpp
+++ b/src/ui/render/window_render_object.cpp
@@ -56,6 +56,8 @@ WindowRenderObject::WindowRenderObject(Window* window)
     : window_(window), render_host_(new WindowRenderHost(this)) {
   SetChildMode(ChildMode::Single);
   SetRenderHost(render_host_.get());
+  after_layout_event_guard_.Reset(render_host_->AfterLayoutEvent()->AddHandler(
+      [this](auto) { NotifyAfterLayoutRecursive(this); }));
 }
 
 void WindowRenderObject::Relayout() {