Merge branch '12-layout' into 'master'

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

Closes #12

See merge request crupest/CruUI!12

1 files changed, 16 insertions, 31 deletions

diff --git a/src/ui/controls/button.cpp b/src/ui/controls/button.cpp
index 2ecc9f14..db0b71c2 100644
--- a/src/ui/controls/button.cpp
+++ b/src/ui/controls/button.cpp
@@ -8,46 +8,31 @@ namespace cru::ui::controls
 
     Button::Button() : Control(true)
     {
-        normal_border_border_ = BorderProperty::Create();
-        normal_border_border_->SetBrush(CreateSolidBrush(D2D1::ColorF(D2D1::ColorF::RoyalBlue)));
-        normal_border_border_->SetWidth(2);
-        normal_border_border_->SetRadiusX(6);
-        normal_border_border_->SetRadiusY(6);
-
-        pressed_border_border_ = BorderProperty::Create();
-        pressed_border_border_->SetBrush(CreateSolidBrush(D2D1::ColorF(D2D1::ColorF::Blue)));
-        pressed_border_border_->SetWidth(2);
-        pressed_border_border_->SetRadiusX(6);
-        pressed_border_border_->SetRadiusY(6);
-
-        border_delegate_ = std::make_unique<BorderDelegate>(this, normal_border_border_);
-    }
-
-    void Button::OnDraw(ID2D1DeviceContext* device_context)
-    {
-        Control::OnDraw(device_context);
-        border_delegate_->Draw(device_context, GetSize());
-    }
-
-    Size Button::OnMeasure(const Size& available_size)
-    {
-        return Control::DefaultMeasureWithPadding(available_size, border_delegate_->GetBorderThickness());
-    }
-
-    void Button::OnLayout(const Rect& rect)
-    {
-        Control::DefaultLayoutWithPadding(rect, border_delegate_->GetBorderThickness());
+        normal_border_ = BorderProperty::Create();
+        normal_border_->SetBrush(CreateSolidBrush(D2D1::ColorF(D2D1::ColorF::RoyalBlue)));
+        normal_border_->SetWidth(2);
+        normal_border_->SetRadiusX(6);
+        normal_border_->SetRadiusY(6);
+
+        pressed_border_ = BorderProperty::Create();
+        pressed_border_->SetBrush(CreateSolidBrush(D2D1::ColorF(D2D1::ColorF::Blue)));
+        pressed_border_->SetWidth(2);
+        pressed_border_->SetRadiusX(6);
+        pressed_border_->SetRadiusY(6);
+
+        SetBordered(true);
+        SetBorderProperty(normal_border_);
     }
 
     void Button::OnMouseClickBegin(MouseButton button)
     {
-        border_delegate_->SetBorderProperty(pressed_border_border_);
+        SetBorderProperty(pressed_border_);
         Repaint();
     }
 
     void Button::OnMouseClickEnd(MouseButton button)
     {
-        border_delegate_->SetBorderProperty(normal_border_border_);
+        SetBorderProperty(normal_border_);
         Repaint();
     }
 }