Merge branch '12-layout' into 'master'

Resolve "Add padding, margin, border to Control."

Closes #12

See merge request crupest/CruUI!12

1 files changed, 0 insertions, 54 deletions

diff --git a/src/ui/controls/border.h b/src/ui/controls/border.h
deleted file mode 100644
index 7880e690..00000000
--- a/src/ui/controls/border.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-#include <initializer_list>
-
-#include "ui/control.h"
-#include "border_delegate.h"
-
-namespace cru::ui::controls
-{
-    class Border : public Control
-    {
-    public:
-        static Border* Create(const std::initializer_list<Control*>& children = std::initializer_list<Control*>())
-        {
-            const auto border = new Border();
-            for (const auto control : children)
-                border->AddChild(control);
-            return border;
-        }
-
-    protected:
-        Border();
-
-    public:
-        Border(const Border& other) = delete;
-        Border(Border&& other) = delete;
-        Border& operator=(const Border& other) = delete;
-        Border& operator=(Border&& other) = delete;
-        ~Border() override = default;
-
-        bool IsDrawBorder() const
-        {
-            return draw_border_;
-        }
-
-        void SetDrawBorder(bool draw_border);
-
-        BorderProperty::Ptr GetBorderProperty() const
-        {
-            return border_delegate_.GetBorderProperty();
-        }
-
-    protected:
-        void OnDraw(ID2D1DeviceContext* device_context) override;
-
-        Size OnMeasure(const Size& available_size) override;
-        void OnLayout(const Rect& rect) override;
-
-    private:
-        bool draw_border_ = true;
-
-        BorderDelegate border_delegate_;
-    };
-}