Merge branch 'master' of https://github.com/crupest/CruUI

1 files changed, 6 insertions, 4 deletions

diff --git a/src/ui/controls/Container.cpp b/src/ui/controls/Container.cpp
index de58ee64..30129f64 100644
--- a/src/ui/controls/Container.cpp
+++ b/src/ui/controls/Container.cpp
@@ -1,18 +1,20 @@
 #include "cru/ui/controls/Container.hpp"
 
-#include "cru/platform/graph/Factory.hpp"
+#include "cru/platform/graphics/Factory.hpp"
 #include "cru/ui/render/BorderRenderObject.hpp"
+#include "cru/ui/render/RenderObject.hpp"
 
 namespace cru::ui::controls {
 Container::Container() {
   render_object_ = std::make_unique<render::BorderRenderObject>();
   render_object_->SetBorderEnabled(false);
+  render_object_->SetAttachedControl(this);
+  SetContainerRenderObject(render_object_.get());
 }
 
 Container::~Container() = default;
 
-void Container::OnChildChanged(Control*, Control* new_child) {
-  render_object_->RemoveChild(0);
-  render_object_->AddChild(new_child->GetRenderObject(), 0);
+render::RenderObject* Container::GetRenderObject() const {
+  return render_object_.get();
 }
 }  // namespace cru::ui::controls