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, 37 deletions

diff --git a/src/ui/controls/border.cpp b/src/ui/controls/border.cpp
deleted file mode 100644
index 1caed91d..00000000
--- a/src/ui/controls/border.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "border.h"
-
-#include "graph/graph.h"
-
-namespace cru::ui::controls
-{
-    using graph::CreateSolidBrush;
-
-    Border::Border() : Control(true), border_delegate_(this)
-    {
-
-    }
-
-    void Border::SetDrawBorder(const bool draw_border)
-    {
-        draw_border_ = draw_border;
-        Repaint();
-    }
-
-    void Border::OnDraw(ID2D1DeviceContext* device_context)
-    {
-        if (draw_border_)
-        {
-            border_delegate_.Draw(device_context, GetSize());
-        }
-    }
-
-    Size Border::OnMeasure(const Size& available_size)
-    {
-        return Control::DefaultMeasureWithPadding(available_size, border_delegate_.GetBorderThickness());
-    }
-
-    void Border::OnLayout(const Rect& rect)
-    {
-        Control::DefaultLayoutWithPadding(rect, border_delegate_.GetBorderThickness());
-    }
-}