Merge branch '12-layout' into 'master'

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

Closes #12

See merge request crupest/CruUI!12

1 files changed, 3 insertions, 3 deletions

diff --git a/src/ui/controls/toggle_button.h b/src/ui/controls/toggle_button.h
index d496f21a..90bbd49b 100644
--- a/src/ui/controls/toggle_button.h
+++ b/src/ui/controls/toggle_button.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "ui/control.h"
 
@@ -40,11 +40,11 @@ namespace cru::ui::controls
         virtual void OnToggle(events::ToggleEventArgs& args);
 
     protected:
-        void OnDraw(ID2D1DeviceContext* device_context) override;
+        void OnDrawContent(ID2D1DeviceContext* device_context) override;
 
         void OnMouseClickCore(events::MouseButtonEventArgs& args) override;
 
-        Size OnMeasure(const Size& available_size) override;
+        Size OnMeasureContent(const Size& available_size) override;
 
     private:
         void RaiseToggleEvent(bool new_state);