aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CruUI/CruUI.vcxproj2
-rw-r--r--CruUI/CruUI.vcxproj.filters6
-rw-r--r--CruUI/main.cpp6
-rw-r--r--CruUI/ui/controls/margin_container.cpp63
-rw-r--r--CruUI/ui/controls/margin_container.h44
-rw-r--r--CruUI/ui/ui_base.h8
6 files changed, 127 insertions, 2 deletions
diff --git a/CruUI/CruUI.vcxproj b/CruUI/CruUI.vcxproj
index 78e24f9b..3d15905b 100644
--- a/CruUI/CruUI.vcxproj
+++ b/CruUI/CruUI.vcxproj
@@ -166,6 +166,7 @@
<ClInclude Include="global_macros.h" />
<ClInclude Include="ui\controls\button.h" />
<ClInclude Include="ui\controls\linear_layout.h" />
+ <ClInclude Include="ui\controls\margin_container.h" />
<ClInclude Include="ui\controls\text_block.h" />
<ClInclude Include="ui\controls\toggle_button.h" />
<ClInclude Include="ui\events\ui_event.h" />
@@ -179,6 +180,7 @@
<ClCompile Include="exception.cpp" />
<ClCompile Include="ui\animations\animation.cpp" />
<ClCompile Include="ui\controls\button.cpp" />
+ <ClCompile Include="ui\controls\margin_container.cpp" />
<ClCompile Include="ui\layout_base.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="graph\graph.cpp" />
diff --git a/CruUI/CruUI.vcxproj.filters b/CruUI/CruUI.vcxproj.filters
index f1cbe6e9..aea865eb 100644
--- a/CruUI/CruUI.vcxproj.filters
+++ b/CruUI/CruUI.vcxproj.filters
@@ -72,6 +72,9 @@
<ClInclude Include="ui\controls\button.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="ui\controls\margin_container.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="application.cpp">
@@ -122,5 +125,8 @@
<ClCompile Include="ui\controls\button.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="ui\controls\margin_container.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/CruUI/main.cpp b/CruUI/main.cpp
index 9cd566ab..f2c5747d 100644
--- a/CruUI/main.cpp
+++ b/CruUI/main.cpp
@@ -4,6 +4,7 @@
#include "ui/controls/text_block.h"
#include "ui/controls/toggle_button.h"
#include "ui/controls/button.h"
+#include "ui/controls/margin_container.h"
using cru::String;
@@ -12,11 +13,12 @@ using cru::ui::Window;
using cru::ui::MeasureMode;
using cru::ui::Alignment;
using cru::ui::LayoutLength;
+using cru::ui::Thickness;
using cru::ui::controls::LinearLayout;
using cru::ui::controls::TextBlock;
using cru::ui::controls::ToggleButton;
using cru::ui::controls::Button;
-
+using cru::ui::controls::MarginContainer;
int APIENTRY wWinMain(
HINSTANCE hInstance,
@@ -103,7 +105,7 @@ int APIENTRY wWinMain(
{
const auto button = Button::Create();
- button->AddChild(TextBlock::Create(L"button"));
+ button->AddChild(MarginContainer::Create(Thickness(20, 5), {TextBlock::Create(L"button")}));
layout->AddChild(button);
}
diff --git a/CruUI/ui/controls/margin_container.cpp b/CruUI/ui/controls/margin_container.cpp
new file mode 100644
index 00000000..8f9101b2
--- /dev/null
+++ b/CruUI/ui/controls/margin_container.cpp
@@ -0,0 +1,63 @@
+#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;
+ Relayout();
+ }
+
+ Size MarginContainer::OnMeasure(const Size& available_size)
+ {
+ const auto margin_size = Size(margin_.left + margin_.right, margin_.top + margin_.bottom);
+ const auto coerced_available_size = AtLeast0(available_size - margin_size);
+ return Control::OnMeasure(coerced_available_size) + margin_size;
+ }
+
+ void MarginContainer::OnLayout(const Rect& rect)
+ {
+ const auto anchor = Point(margin_.left, margin_.top);
+ const auto margin_size = Size(margin_.left + margin_.right, margin_.top + margin_.bottom);
+ ForeachChild([anchor, margin_size, rect](Control* control)
+ {
+ const auto layout_params = control->GetLayoutParams();
+ const auto size = control->GetDesiredSize();
+
+ auto&& calculate_anchor = [](const float anchor, const Alignment alignment, const float layout_length, const float control_length) -> float
+ {
+ switch (alignment)
+ {
+ case Alignment::Center:
+ return anchor + (layout_length - control_length) / 2;
+ case Alignment::Start:
+ return anchor;
+ case Alignment::End:
+ return anchor + layout_length - control_length;
+ default:
+ UnreachableCode();
+ }
+ };
+
+ control->Layout(Rect(Point(
+ calculate_anchor(anchor.x, layout_params->width.alignment, rect.width - margin_size.width, size.width),
+ calculate_anchor(anchor.y, layout_params->height.alignment, rect.height - margin_size.height, size.height)
+ ), size));
+ });
+ }
+}
diff --git a/CruUI/ui/controls/margin_container.h b/CruUI/ui/controls/margin_container.h
new file mode 100644
index 00000000..0eafc40e
--- /dev/null
+++ b/CruUI/ui/controls/margin_container.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <initializer_list>
+
+#include "ui/control.h"
+
+namespace cru::ui::controls
+{
+ class MarginContainer : public Control
+ {
+ public:
+ static MarginContainer* Create(const Thickness& margin = Thickness::Zero(), const std::initializer_list<Control*>& children = std::initializer_list<Control*>())
+ {
+ const auto margin_container = new MarginContainer(margin);
+ for (const auto control : children)
+ margin_container->AddChild(control);
+ return margin_container;
+ }
+
+ protected:
+ explicit MarginContainer(const Thickness& margin);
+
+ public:
+ MarginContainer(const MarginContainer& other) = delete;
+ MarginContainer(MarginContainer&& other) = delete;
+ MarginContainer& operator=(const MarginContainer& other) = delete;
+ MarginContainer& operator=(MarginContainer&& other) = delete;
+ ~MarginContainer() override = default;
+
+ Thickness GetMargin() const
+ {
+ return margin_;
+ }
+
+ void SetMargin(const Thickness& margin);
+
+ protected:
+ Size OnMeasure(const Size& available_size) override;
+ void OnLayout(const Rect& rect) override;
+
+ private:
+ Thickness margin_;
+ };
+}
diff --git a/CruUI/ui/ui_base.h b/CruUI/ui/ui_base.h
index 17e1bda9..c9ae6017 100644
--- a/CruUI/ui/ui_base.h
+++ b/CruUI/ui/ui_base.h
@@ -108,11 +108,19 @@ namespace cru
struct Thickness
{
+ constexpr static Thickness Zero()
+ {
+ return Thickness(0);
+ }
+
constexpr Thickness() : Thickness(0) { }
constexpr explicit Thickness(const float width)
: left(width), top(width), right(width), bottom(width) { }
+ constexpr explicit Thickness(const float horizontal, const float vertical)
+ : left(horizontal), top(vertical), right(horizontal), bottom(vertical) { }
+
constexpr Thickness(const float left, const float top, const float right, const float bottom)
: left(left), top(top), right(right), bottom(bottom) { }
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-08 09:08:23 +0000