diff options
| author | crupest <crupest@outlook.com> | 2021-03-24 19:14:19 +0800 | 
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2021-03-24 19:14:19 +0800 | 
| commit | 7f15a1ff9a2007e119798053083a0a87d042990a (patch) | |
| tree | cb35c01a7eaee867376d959b96c9bbd15df939e5 /src/ui/controls/Container.cpp | |
| parent | 74956951ee663012df0c3fe4ebe29799cb2f7732 (diff) | |
| parent | 7703063a5816b089483e78ccd74bb9902ccfbea8 (diff) | |
| download | cru-7f15a1ff9a2007e119798053083a0a87d042990a.tar.gz cru-7f15a1ff9a2007e119798053083a0a87d042990a.tar.bz2 cru-7f15a1ff9a2007e119798053083a0a87d042990a.zip | |
Merge branch 'master' of https://github.com/crupest/CruUI
Diffstat (limited to 'src/ui/controls/Container.cpp')
| -rw-r--r-- | src/ui/controls/Container.cpp | 10 | 
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 | 
