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, 7 insertions, 38 deletions

diff --git a/src/ui/controls/border.h b/src/ui/controls/border.h
index 74e12c92..7880e690 100644
--- a/src/ui/controls/border.h
+++ b/src/ui/controls/border.h
@@ -3,6 +3,7 @@
 #include <initializer_list>
 
 #include "ui/control.h"
+#include "border_delegate.h"
 
 namespace cru::ui::controls
 {
@@ -34,52 +35,20 @@ namespace cru::ui::controls
 
         void SetDrawBorder(bool draw_border);
 
-        Microsoft::WRL::ComPtr<ID2D1Brush> GetBorderBrush() const
+        BorderProperty::Ptr GetBorderProperty() const
         {
-            return border_brush_;
+            return border_delegate_.GetBorderProperty();
         }
 
-        void SetBorderBrush(Microsoft::WRL::ComPtr<ID2D1Brush> border_brush);
-
-        float GetBorderWidth() const
-        {
-            return border_width_;
-        }
-
-        void SetBorderWidth(float border_width);
-
-        Microsoft::WRL::ComPtr<ID2D1StrokeStyle> GetBorderStrokeStyle() const
-        {
-            return border_stroke_style_;
-        }
-
-        void SetBorderStrokeStyle(Microsoft::WRL::ComPtr<ID2D1StrokeStyle> stroke_style);
-
-        float GetBorderRadiusX() const
-        {
-            return border_radius_x_;
-        }
-
-        void SetBorderRadiusX(float border_radius_x);
-
-        float GetBorderRadiusY() const
-        {
-            return border_radius_y_;
-        }
-
-        void SetBorderRadiusY(float border_radius_y);
-
     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;
 
-        Microsoft::WRL::ComPtr<ID2D1Brush> border_brush_;
-        float border_width_ = 1.0f;
-        Microsoft::WRL::ComPtr<ID2D1StrokeStyle> border_stroke_style_ = nullptr;
-
-        float border_radius_x_ = 0.0f;
-        float border_radius_y_ = 0.0f;
+        BorderDelegate border_delegate_;
     };
 }