6 files changed, 26 insertions, 39 deletions
diff --git a/src/theme_builder/components/MainWindow.cpp b/src/theme_builder/components/MainWindow.cpp
index 4c605756..91c093cc 100644
--- a/src/theme_builder/components/MainWindow.cpp
+++ b/src/theme_builder/components/MainWindow.cpp
@@ -9,27 +9,22 @@ using namespace cru::ui::controls;
 using namespace cru::platform::gui;
 
 MainWindow::MainWindow() {
-  window_ = Window::Create();
-  window_->GetNativeWindow()->SetTitle(u"CruUI Theme Builder");
+  window_.GetNativeWindow()->SetTitle(u"CruUI Theme Builder");
+  main_layout_.SetFlexDirection(FlexDirection::Horizontal);
+  window_.AddChild(&main_layout_);
+  main_layout_.AddChild(&preview_layout_);
 
-  main_layout_ = FlexLayout::Create();
-  main_layout_->SetFlexDirection(FlexDirection::Horizontal);
-  window_->AddChild(main_layout_);
-
-  preview_layout_ = StackLayout::Create();
-  main_layout_->AddChild(preview_layout_);
-
-  preview_button_ = Button::Create();
-  preview_button_->SetChild(TextBlock::Create(u"Preview"));
-  preview_layout_->AddChild(preview_button_);
-  preview_layout_->SetChildLayoutData(
+  preview_button_text_.SetText(u"Preview");
+  preview_button_.SetChild(&preview_button_text_);
+  preview_layout_.AddChild(&preview_button_);
+  preview_layout_.SetChildLayoutData(
       0, StackChildLayoutData{Alignment::Center, Alignment::Center});
 }
 
-MainWindow::~MainWindow() { delete window_; }
+MainWindow::~MainWindow() {}
 
 void MainWindow::Show() {
-  window_->GetNativeWindow()->SetVisibility(WindowVisibilityType::Show);
-  window_->GetNativeWindow()->SetToForeground();
+  window_.GetNativeWindow()->SetVisibility(WindowVisibilityType::Show);
+  window_.GetNativeWindow()->SetToForeground();
 }
 }  // namespace cru::theme_builder
diff --git a/src/theme_builder/components/MainWindow.h b/src/theme_builder/components/MainWindow.h
index 101b678e..c6733111 100644
--- a/src/theme_builder/components/MainWindow.h
+++ b/src/theme_builder/components/MainWindow.h
@@ -3,6 +3,7 @@
 #include "cru/ui/controls/Button.h"
 #include "cru/ui/controls/FlexLayout.h"
 #include "cru/ui/controls/StackLayout.h"
+#include "cru/ui/controls/TextBlock.h"
 #include "cru/ui/controls/Window.h"
 
 namespace cru::theme_builder {
@@ -15,14 +16,15 @@ class MainWindow : public ui::components::Component {
 
   ~MainWindow() override;
 
-  ui::controls::Control* GetRootControl() override { return window_; }
+  ui::controls::Control* GetRootControl() override { return &window_; }
 
   void Show();
 
  private:
-  ui::controls::Window* window_;
-  ui::controls::FlexLayout* main_layout_;
-  ui::controls::StackLayout* preview_layout_;
-  ui::controls::Button* preview_button_;
+  ui::controls::Window window_;
+  ui::controls::FlexLayout main_layout_;
+  ui::controls::StackLayout preview_layout_;
+  ui::controls::Button preview_button_;
+  ui::controls::TextBlock preview_button_text_;
 };
 }  // namespace cru::theme_builder
diff --git a/src/theme_builder/components/StyleRuleEditor.cpp b/src/theme_builder/components/StyleRuleEditor.cpp
index 1cbeaeb2..977672e3 100644
--- a/src/theme_builder/components/StyleRuleEditor.cpp
+++ b/src/theme_builder/components/StyleRuleEditor.cpp
@@ -1,14 +1,9 @@
 #include "StyleRuleEditor.h"
 
 namespace cru::theme_builder {
-StyleRuleEditor::StyleRuleEditor() {
-  main_layout_ = ui::controls::FlexLayout::Create();
-}
+StyleRuleEditor::StyleRuleEditor() {}
 
-StyleRuleEditor::~StyleRuleEditor() {
-  main_layout_->RemoveFromParent();
-  delete main_layout_;
-}
+StyleRuleEditor::~StyleRuleEditor() { main_layout_.RemoveFromParent(); }
 
 void StyleRuleEditor::BindStyleRule(ui::style::StyleRule *rule) {
   style_rule_ = rule;
diff --git a/src/theme_builder/components/StyleRuleEditor.h b/src/theme_builder/components/StyleRuleEditor.h
index 181ff0ef..5a14161e 100644
--- a/src/theme_builder/components/StyleRuleEditor.h
+++ b/src/theme_builder/components/StyleRuleEditor.h
@@ -15,7 +15,7 @@ class StyleRuleEditor : public ui::components::Component {
   ~StyleRuleEditor() override;
 
  public:
-  ui::controls::Control* GetRootControl() override { return main_layout_; }
+  ui::controls::Control* GetRootControl() override { return &main_layout_; }
 
   void BindStyleRule(ui::style::StyleRule* rule);
 
@@ -23,7 +23,7 @@ class StyleRuleEditor : public ui::components::Component {
   void UpdateView();
 
  private:
-  ui::controls::FlexLayout* main_layout_;
+  ui::controls::FlexLayout main_layout_;
 
   ui::style::StyleRule* style_rule_;
 };
diff --git a/src/theme_builder/components/StyleRuleSetEditor.cpp b/src/theme_builder/components/StyleRuleSetEditor.cpp
index 313b53da..072b8307 100644
--- a/src/theme_builder/components/StyleRuleSetEditor.cpp
+++ b/src/theme_builder/components/StyleRuleSetEditor.cpp
@@ -3,14 +3,9 @@
 
 namespace cru::theme_builder {
 using namespace cru::ui::controls;
-StyleRuleSetEditor::StyleRuleSetEditor() {
-  main_layout_ = FlexLayout::Create();
-}
+StyleRuleSetEditor::StyleRuleSetEditor() {}
 
-StyleRuleSetEditor::~StyleRuleSetEditor() {
-  main_layout_->RemoveFromParent();
-  delete main_layout_;
-}
+StyleRuleSetEditor::~StyleRuleSetEditor() { main_layout_.RemoveFromParent(); }
 
 void StyleRuleSetEditor::BindStyleRuleSet(
     std::shared_ptr<ui::style::StyleRuleSet> rule_set) {
diff --git a/src/theme_builder/components/StyleRuleSetEditor.h b/src/theme_builder/components/StyleRuleSetEditor.h
index 50f1c80d..75597cf4 100644
--- a/src/theme_builder/components/StyleRuleSetEditor.h
+++ b/src/theme_builder/components/StyleRuleSetEditor.h
@@ -15,7 +15,7 @@ class StyleRuleSetEditor : public ui::components::Component {
   ~StyleRuleSetEditor() override;
 
  public:
-  ui::controls::Control* GetRootControl() override { return main_layout_; }
+  ui::controls::Control* GetRootControl() override { return &main_layout_; }
 
   void BindStyleRuleSet(std::shared_ptr<ui::style::StyleRuleSet> rule_set);
 
@@ -23,7 +23,7 @@ class StyleRuleSetEditor : public ui::components::Component {
   void UpdateView();
 
  private:
-  ui::controls::FlexLayout* main_layout_;
+  ui::controls::FlexLayout main_layout_;
 
   std::shared_ptr<ui::style::StyleRuleSet> style_rule_set_;
 };