1 files changed, 11 insertions, 16 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