...

3 files changed, 19 insertions, 9 deletions

diff --git a/include/cru/ui/components/Component.h b/include/cru/ui/components/Component.h
index 0b871dc4..e889ae97 100644
--- a/include/cru/ui/components/Component.h
+++ b/include/cru/ui/components/Component.h
@@ -2,9 +2,11 @@
 #include "../Base.h"
 
 namespace cru::ui::components {
-// In destructor, component should check all owned controls whether it is
-// attached to window, if not, destroy them, otherwise it is host's duty to
-// destroy them.
+/**
+ * \remarks In destructor, component should first delete all child components
+ * and then remove root control from its parent (by calling
+ * Control::RemoveFromParent). Then delete all its root control.
+ */
 class CRU_UI_API Component : public Object {
  public:
   Component() = default;
diff --git a/src/theme_builder/components/StyleRuleEditor.cpp b/src/theme_builder/components/StyleRuleEditor.cpp
index 8b9df6db..1cbeaeb2 100644
--- a/src/theme_builder/components/StyleRuleEditor.cpp
+++ b/src/theme_builder/components/StyleRuleEditor.cpp
@@ -5,7 +5,10 @@ StyleRuleEditor::StyleRuleEditor() {
   main_layout_ = ui::controls::FlexLayout::Create();
 }
 
-StyleRuleEditor::~StyleRuleEditor() {}
+StyleRuleEditor::~StyleRuleEditor() {
+  main_layout_->RemoveFromParent();
+  delete main_layout_;
+}
 
 void StyleRuleEditor::BindStyleRule(ui::style::StyleRule *rule) {
   style_rule_ = rule;
diff --git a/src/theme_builder/components/StyleRuleSetEditor.cpp b/src/theme_builder/components/StyleRuleSetEditor.cpp
index cfb2ad56..313b53da 100644
--- a/src/theme_builder/components/StyleRuleSetEditor.cpp
+++ b/src/theme_builder/components/StyleRuleSetEditor.cpp
@@ -1,9 +1,16 @@
 #include "StyleRuleSetEditor.h"
+#include "cru/ui/controls/FlexLayout.h"
 
 namespace cru::theme_builder {
-StyleRuleSetEditor::StyleRuleSetEditor() {}
+using namespace cru::ui::controls;
+StyleRuleSetEditor::StyleRuleSetEditor() {
+  main_layout_ = FlexLayout::Create();
+}
 
-StyleRuleSetEditor::~StyleRuleSetEditor() {}
+StyleRuleSetEditor::~StyleRuleSetEditor() {
+  main_layout_->RemoveFromParent();
+  delete main_layout_;
+}
 
 void StyleRuleSetEditor::BindStyleRuleSet(
     std::shared_ptr<ui::style::StyleRuleSet> rule_set) {
@@ -11,7 +18,5 @@ void StyleRuleSetEditor::BindStyleRuleSet(
   UpdateView();
 }
 
-void StyleRuleSetEditor::UpdateView() {
-  
-}
+void StyleRuleSetEditor::UpdateView() {}
 }  // namespace cru::theme_builder