Merge branch '12-layout' into 'master'

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

Closes #12

See merge request crupest/CruUI!12

1 files changed, 2 insertions, 10 deletions

diff --git a/src/ui/controls/button.h b/src/ui/controls/button.h
index 4b57a5a3..011f97d2 100644
--- a/src/ui/controls/button.h
+++ b/src/ui/controls/button.h
@@ -3,7 +3,6 @@
 #include <initializer_list>
 
 #include "ui/control.h"
-#include "border_delegate.h"
 
 namespace cru::ui::controls
 {
@@ -29,18 +28,11 @@ namespace cru::ui::controls
         ~Button() override = default;
 
     protected:
-        void OnDraw(ID2D1DeviceContext* device_context) override;
-
-        Size OnMeasure(const Size& available_size) override;
-        void OnLayout(const Rect& rect) override;
-
         void OnMouseClickBegin(MouseButton button) override final;
         void OnMouseClickEnd(MouseButton button) override final;
 
     private:
-        std::unique_ptr<BorderDelegate> border_delegate_;
-
-        BorderProperty::Ptr normal_border_border_;
-        BorderProperty::Ptr pressed_border_border_;
+        BorderProperty::Ptr normal_border_;
+        BorderProperty::Ptr pressed_border_;
     };
 }