Merge branch '12-layout' into 'master'

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

Closes #12

See merge request crupest/CruUI!12

1 files changed, 0 insertions, 35 deletions

diff --git a/src/ui/controls/margin_container.cpp b/src/ui/controls/margin_container.cpp
deleted file mode 100644
index 12dde025..00000000
--- a/src/ui/controls/margin_container.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "margin_container.h"
-
-namespace cru::ui::controls
-{
-    inline float AtLeast0(const float value)
-    {
-        return value < 0 ? 0 : value;
-    }
-
-    inline Size AtLeast0(const Size& size)
-    {
-        return Size(AtLeast0(size.width), AtLeast0(size.height));
-    }
-
-    MarginContainer::MarginContainer(const Thickness& margin)
-        : Control(true), margin_(margin)
-    {
-    }
-
-    void MarginContainer::SetMargin(const Thickness& margin)
-    {
-        margin_ = margin;
-        InvalidateLayout();
-    }
-
-    Size MarginContainer::OnMeasure(const Size& available_size)
-    {
-        return DefaultMeasureWithPadding(available_size, margin_);
-    }
-
-    void MarginContainer::OnLayout(const Rect& rect)
-    {
-        DefaultLayoutWithPadding(rect, margin_);
-    }
-}