Merge branch '9-border' into 'master'

Resolve "Abstract out border control of button and border."

Closes #9

See merge request crupest/CruUI!11

1 files changed, 26 insertions, 6 deletions

diff --git a/src/ui/controls/button.cpp b/src/ui/controls/button.cpp
index b7614f93..2ecc9f14 100644
--- a/src/ui/controls/button.cpp
+++ b/src/ui/controls/button.cpp
@@ -8,26 +8,46 @@ namespace cru::ui::controls
 
     Button::Button() : Control(true)
     {
-        normal_border_brush_ = CreateSolidBrush(D2D1::ColorF(D2D1::ColorF::RoyalBlue));
-        pressed_border_brush_ = CreateSolidBrush(D2D1::ColorF(D2D1::ColorF::MediumBlue));
-        current_border_brush_ = normal_border_brush_.Get();
+        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);
-        device_context->DrawRoundedRectangle(D2D1::RoundedRect(D2D1::RectF(0, 0, GetSize().width, GetSize().height), 6, 6), current_border_brush_, 2);
+        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());
     }
 
     void Button::OnMouseClickBegin(MouseButton button)
     {
-        current_border_brush_ = pressed_border_brush_.Get();
+        border_delegate_->SetBorderProperty(pressed_border_border_);
         Repaint();
     }
 
     void Button::OnMouseClickEnd(MouseButton button)
     {
-        current_border_brush_ = normal_border_brush_.Get();
+        border_delegate_->SetBorderProperty(normal_border_border_);
         Repaint();
     }
 }