Merge pull request #37 from crupest/render

Refactor.

1 files changed, 28 insertions, 33 deletions

diff --git a/src/ui/controls/button.hpp b/src/ui/controls/button.hpp
index 82694fe8..3f313dfc 100644
--- a/src/ui/controls/button.hpp
+++ b/src/ui/controls/button.hpp
@@ -1,44 +1,39 @@
 #pragma once
-
-// ReSharper disable once CppUnusedIncludeDirective
 #include "pre.hpp"
 
-#include <initializer_list>
+#include <memory>
 
-#include "ui/control.hpp"
+#include "ui/content_control.hpp"
 
-namespace cru::ui::controls
-{
-    class Button : public SingleChildControl
-    {
-    public:
-        static constexpr auto control_type = L"Button";
+namespace cru::ui::render {
+class BorderRenderObject;
+}
 
-        static Button* Create(Control* child = nullptr)
-        {
-            const auto button = new Button();
-            button->SetChild(child);
-            return button;
-        }
+namespace cru::ui::controls {
+class Button : public ContentControl {
+ public:
+  static constexpr auto control_type = L"Button";
 
-    protected:
-        Button();
+  static Button* Create() { return new 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;
+ protected:
+  Button();
 
-        StringView GetControlType() const override final;
+ public:
+  Button(const Button& other) = delete;
+  Button(Button&& other) = delete;
+  Button& operator=(const Button& other) = delete;
+  Button& operator=(Button&& other) = delete;
+  ~Button() override = default;
 
-    protected:
-        void OnMouseClickBegin(MouseButton button) override final;
-        void OnMouseClickEnd(MouseButton button) override final;
+  StringView GetControlType() const override final { return control_type; }
 
-    private:
-        BorderProperty normal_border_;
-        BorderProperty pressed_border_;
-    };
-}
+  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