2 files changed, 10 insertions, 21 deletions
diff --git a/src/ui/render/render_object.cpp b/src/ui/render/render_object.cpp
index 7f6255f7..d220b1c1 100644
--- a/src/ui/render/render_object.cpp
+++ b/src/ui/render/render_object.cpp
@@ -18,6 +18,7 @@ void RenderObject::AddChild(RenderObject* render_object, const int position) {
 
   children_.insert(children_.cbegin() + position, render_object);
   render_object->SetParent(this);
+  render_object->SetRenderHostRecursive(GetRenderHost());
   OnAddChild(render_object, position);
 }
 
@@ -30,6 +31,7 @@ void RenderObject::RemoveChild(const int position) {
   const auto removed_child = *i;
   children_.erase(i);
   removed_child->SetParent(nullptr);
+  removed_child->SetRenderHostRecursive(nullptr);
   OnRemoveChild(removed_child, position);
 }
 
@@ -140,4 +142,12 @@ void RenderObject::NotifyAfterLayoutRecursive(RenderObject* render_object) {
     NotifyAfterLayoutRecursive(o);
   }
 }
+
+void RenderObject::SetRenderHostRecursive(IRenderHost* host) {
+  SetRenderHost(host);
+  for (const auto child : GetChildren()) {
+    child->SetRenderHostRecursive(host);
+  }
+}
+
 }  // namespace cru::ui::render
diff --git a/src/ui/render/window_render_object.cpp b/src/ui/render/window_render_object.cpp
index 12fc2ce1..1001be87 100644
--- a/src/ui/render/window_render_object.cpp
+++ b/src/ui/render/window_render_object.cpp
@@ -88,27 +88,6 @@ RenderObject* WindowRenderObject::HitTest(const Point& point) {
   return Rect{Point{}, GetSize()}.IsPointInside(point) ? this : nullptr;
 }
 
-namespace {
-void SetRenderHostRecursive(RenderObject* render_object, IRenderHost* host) {
-  render_object->SetRenderHost(host);
-  for (const auto child : render_object->GetChildren()) {
-    SetRenderHostRecursive(child, host);
-  }
-}
-}  // namespace
-
-void WindowRenderObject::OnAddChild(RenderObject* new_child, int position) {
-  CRU_UNUSED(position)
-
-  SetRenderHostRecursive(new_child, render_host_.get());
-}
-
-void WindowRenderObject::OnRemoveChild(RenderObject* new_child, int position) {
-  CRU_UNUSED(position)
-
-  SetRenderHostRecursive(new_child, nullptr);
-}
-
 Size WindowRenderObject::OnMeasureContent(const Size& available_size) {
   if (const auto child = GetChild()) child->Measure(available_size);
   return available_size;