From 683419f2856d348436ca64cfd4b3abbfc73cda89 Mon Sep 17 00:00:00 2001 From: crupest Date: Sat, 15 Sep 2018 23:28:06 +0800 Subject: ... --- CruUI/ui/controls/linear_layout.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'CruUI/ui/controls/linear_layout.cpp') diff --git a/CruUI/ui/controls/linear_layout.cpp b/CruUI/ui/controls/linear_layout.cpp index 1d88a4e1..33a7855f 100644 --- a/CruUI/ui/controls/linear_layout.cpp +++ b/CruUI/ui/controls/linear_layout.cpp @@ -57,7 +57,11 @@ namespace cru::ui::controls } }); - auto actual_size_for_children = total_available_size_for_children - rest_available_size_for_children; + auto actual_size_for_children = total_available_size_for_children; + if (orientation_ == Orientation::Horizontal) + actual_size_for_children.width -= rest_available_size_for_children.width; + else + actual_size_for_children.height -= rest_available_size_for_children.height; auto&& calculate_final_length = [](const MeasureLength& layout_length, const float length_for_children, const float max_child_length) -> float { -- cgit v1.2.3