5 files changed, 121 insertions, 2 deletions
diff --git a/include/cru/ui/controls/button.hpp b/include/cru/ui/controls/button.hpp
new file mode 100644
index 00000000..348416c5
--- /dev/null
+++ b/include/cru/ui/controls/button.hpp
@@ -0,0 +1,39 @@
+#pragma once
+#include "../content_control.hpp"
+
+#include <memory>
+
+namespace cru::ui::render {
+class BorderRenderObject;
+}
+
+namespace cru::ui::controls {
+class Button : public ContentControl {
+ public:
+  static constexpr auto control_type = L"Button";
+
+  static Button* Create() { return new Button(); }
+
+ protected:
+  Button();
+
+ public:
+  Button(const Button& other) = delete;
+  Button(Button&& other) = delete;
+  Button& operator=(const Button& other) = delete;
+  Button& operator=(Button&& other) = delete;
+  ~Button() override = default;
+
+  std::wstring_view GetControlType() const override final {
+    return control_type;
+  }
+
+  render::RenderObject* GetRenderObject() const override;
+
+ protected:
+  void OnChildChanged(Control* old_child, Control* new_child) override;
+
+ private:
+  std::shared_ptr<render::BorderRenderObject> render_object_{};
+};
+}  // namespace cru::ui::controls
diff --git a/include/cru/ui/controls/flex_layout.hpp b/include/cru/ui/controls/flex_layout.hpp
new file mode 100644
index 00000000..7422bc05
--- /dev/null
+++ b/include/cru/ui/controls/flex_layout.hpp
@@ -0,0 +1,41 @@
+#pragma once
+#include "../layout_control.hpp"
+
+#include <memory>
+
+namespace cru::ui::render {
+class FlexLayoutRenderObject;
+}
+
+namespace cru::ui::controls {
+
+class FlexLayout : public LayoutControl {
+ public:
+  static constexpr auto control_type = L"FlexLayout";
+
+  static FlexLayout* Create() { return new FlexLayout(); }
+
+ protected:
+  FlexLayout();
+
+ public:
+  FlexLayout(const FlexLayout& other) = delete;
+  FlexLayout(FlexLayout&& other) = delete;
+  FlexLayout& operator=(const FlexLayout& other) = delete;
+  FlexLayout& operator=(FlexLayout&& other) = delete;
+  ~FlexLayout() override = default;
+
+  std::wstring_view GetControlType() const override final {
+    return control_type;
+  }
+
+  render::RenderObject* GetRenderObject() const override;
+
+ protected:
+  void OnAddChild(Control* child, int position) override;
+  void OnRemoveChild(Control* child, int position) override;
+
+ private:
+  std::shared_ptr<render::FlexLayoutRenderObject> render_object_;
+};
+}  // namespace cru::ui::controls
diff --git a/include/cru/ui/controls/text_block.hpp b/include/cru/ui/controls/text_block.hpp
new file mode 100644
index 00000000..45cd12b9
--- /dev/null
+++ b/include/cru/ui/controls/text_block.hpp
@@ -0,0 +1,39 @@
+#pragma once
+#include "../no_child_control.hpp"
+
+#include <memory>
+
+namespace cru::ui::render {
+class TextRenderObject;
+}
+
+namespace cru::ui::controls {
+class TextBlock : public NoChildControl {
+ public:
+  static constexpr auto control_type = L"TextBlock";
+
+  static TextBlock* Create() { return new TextBlock(); }
+
+ protected:
+  TextBlock();
+
+ public:
+  TextBlock(const TextBlock& other) = delete;
+  TextBlock(TextBlock&& other) = delete;
+  TextBlock& operator=(const TextBlock& other) = delete;
+  TextBlock& operator=(TextBlock&& other) = delete;
+  ~TextBlock() override = default;
+
+  std::wstring_view GetControlType() const override final {
+    return control_type;
+  }
+
+  render::RenderObject* GetRenderObject() const override;
+
+  std::wstring GetText() const;
+  void SetText(std::wstring text);
+
+ private:
+  std::shared_ptr<render::TextRenderObject> render_object_;
+};
+}  // namespace cru::ui::controls
diff --git a/include/cru/ui/render/text_render_object.hpp b/include/cru/ui/render/text_render_object.hpp
index 329af18a..527fcd71 100644
--- a/include/cru/ui/render/text_render_object.hpp
+++ b/include/cru/ui/render/text_render_object.hpp
@@ -21,7 +21,7 @@ class TextRenderObject : public RenderObject {
   TextRenderObject(TextRenderObject&& other) = delete;
   TextRenderObject& operator=(const TextRenderObject& other) = delete;
   TextRenderObject& operator=(TextRenderObject&& other) = delete;
-  ~TextRenderObject() override;
+  ~TextRenderObject() override = default;
 
   std::wstring GetText() const;
   void SetText(std::wstring new_text);
diff --git a/include/cru/ui/window.hpp b/include/cru/ui/window.hpp
index 94deb4c5..991ebf70 100644
--- a/include/cru/ui/window.hpp
+++ b/include/cru/ui/window.hpp
@@ -38,7 +38,7 @@ class Window final : public ContentControl {
 
   render::RenderObject* GetRenderObject() const override;
 
-  platform::NativeWindow* GetNativeWindow() const;
+  platform::NativeWindow* GetNativeWindow() const { return native_window_; }
 
   Control* GetMouseHoverControl() const { return mouse_hover_control_; }