...

1 files changed, 11 insertions, 23 deletions

diff --git a/demos/main/main.cpp b/demos/main/main.cpp
index 82038731..3026baeb 100644
--- a/demos/main/main.cpp
+++ b/demos/main/main.cpp
@@ -1,6 +1,7 @@
 #include "cru/platform/HeapDebug.hpp"
 #include "cru/platform/native/UiApplication.hpp"
 #include "cru/platform/native/Window.hpp"
+#include "cru/ui/Base.hpp"
 #include "cru/ui/UiHost.hpp"
 #include "cru/ui/Window.hpp"
 #include "cru/ui/controls/Button.hpp"
@@ -10,12 +11,9 @@
 #include "cru/ui/controls/TextBox.hpp"
 
 using cru::platform::native::CreateUiApplication;
-using cru::ui::Rect;
-using cru::ui::Thickness;
 using cru::ui::Window;
 using cru::ui::controls::Button;
 using cru::ui::controls::FlexLayout;
-using cru::ui::controls::StackLayout;
 using cru::ui::controls::TextBlock;
 using cru::ui::controls::TextBox;
 
@@ -31,30 +29,20 @@ int main() {
   const auto flex_layout = FlexLayout::Create();
 
   window->SetChild(flex_layout);
+  flex_layout->SetFlexDirection(cru::ui::FlexDirection::Vertical);
 
-  const auto button = Button::Create();
-  const auto text_block1 = TextBlock::Create();
-  text_block1->SetText(u"Hello World!");
-  button->SetChild(text_block1);
-  flex_layout->AddChild(button, 0);
-
-  const auto text_block2 = TextBlock::Create();
-  text_block2->SetText(u"Hello World!");
-
-  const auto text_block3 = TextBlock::Create();
-  text_block3->SetText(u"Overlapped text");
+  const auto text_block = TextBlock::Create();
+  text_block->SetText(u"Hello World from CruUI!");
+  flex_layout->AddChild(text_block, 0);
 
-  const auto stack_layout = StackLayout::Create();
-  stack_layout->AddChild(text_block2, 0);
-  stack_layout->AddChild(text_block3, 1);
-  flex_layout->AddChild(stack_layout, 1);
-
-  const auto text_block4 = TextBlock::Create();
-  text_block4->SetText(u"Hello World!!!");
-  flex_layout->AddChild(text_block4, 2);
+  const auto button_text_block = TextBlock::Create();
+  button_text_block->SetText(u"OK");
+  const auto button = Button::Create();
+  button->SetChild(button_text_block);
+  flex_layout->AddChild(button, 1);
 
   const auto text_box = TextBox::Create();
-  flex_layout->AddChild(text_box, 3);
+  flex_layout->AddChild(text_box, 2);
 
   window->GetUiHost()->GetNativeWindowResolver()->Resolve()->SetVisible(true);