diff options
| author | crupest <crupest@outlook.com> | 2018-09-22 23:01:16 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2018-09-22 23:01:16 +0800 |
| commit | 51c1550662d0abbc941183593b43c129917b5099 (patch) | |
| tree | d994896616de27e9ef47dfbefb70e652ccb23e81 /CruUI/ui/controls | |
| parent | 5d91d1e5594e37ca5c282e602407eaeb34c6d986 (diff) | |
| download | cru-51c1550662d0abbc941183593b43c129917b5099.tar.gz cru-51c1550662d0abbc941183593b43c129917b5099.tar.bz2 cru-51c1550662d0abbc941183593b43c129917b5099.zip | |
Rename LayoutLength to LayoutSideParams.
Diffstat (limited to 'CruUI/ui/controls')
| -rw-r--r-- | CruUI/ui/controls/linear_layout.cpp | 4 | ||||
| -rw-r--r-- | CruUI/ui/controls/text_block.cpp | 4 | ||||
| -rw-r--r-- | CruUI/ui/controls/toggle_button.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CruUI/ui/controls/linear_layout.cpp b/CruUI/ui/controls/linear_layout.cpp index 22bf26e9..8f537ea8 100644 --- a/CruUI/ui/controls/linear_layout.cpp +++ b/CruUI/ui/controls/linear_layout.cpp @@ -25,7 +25,7 @@ namespace cru::ui::controls if (!layout_params->Validate()) throw std::runtime_error("LayoutParams is not valid. Please check it."); - auto&& get_available_length_for_child = [](const LayoutLength& layout_length, const float available_length) -> float + auto&& get_available_length_for_child = [](const LayoutSideParams& layout_length, const float available_length) -> float { switch (layout_length.mode) { @@ -119,7 +119,7 @@ namespace cru::ui::controls actual_size_for_children.height -= rest_available_size_for_children.height; } - auto&& calculate_final_length = [](const LayoutLength& layout_length, const float length_for_children, const float max_child_length) -> float + auto&& calculate_final_length = [](const LayoutSideParams& layout_length, const float length_for_children, const float max_child_length) -> float { switch (layout_length.mode) { diff --git a/CruUI/ui/controls/text_block.cpp b/CruUI/ui/controls/text_block.cpp index 314870c5..8800fd91 100644 --- a/CruUI/ui/controls/text_block.cpp +++ b/CruUI/ui/controls/text_block.cpp @@ -205,7 +205,7 @@ namespace cru if (layout_params->width.mode == MeasureMode::Stretch && layout_params->height.mode == MeasureMode::Stretch) return available_size; - auto&& get_measure_length = [](const LayoutLength& layout_length, const float available_length) -> float + auto&& get_measure_length = [](const LayoutSideParams& layout_length, const float available_length) -> float { switch (layout_length.mode) { @@ -235,7 +235,7 @@ namespace cru const Size measure_result(metrics.width, metrics.height); - auto&& calculate_final_length = [](const LayoutLength& layout_length, const float measure_length, const float measure_result_length) -> float + auto&& calculate_final_length = [](const LayoutSideParams& layout_length, const float measure_length, const float measure_result_length) -> float { if ((layout_length.mode == MeasureMode::Stretch || layout_length.mode == MeasureMode::Exactly) diff --git a/CruUI/ui/controls/toggle_button.cpp b/CruUI/ui/controls/toggle_button.cpp index 9812a6f4..68bd0fc9 100644 --- a/CruUI/ui/controls/toggle_button.cpp +++ b/CruUI/ui/controls/toggle_button.cpp @@ -112,7 +112,7 @@ namespace cru::ui::controls { const auto layout_params = GetLayoutParams(); - auto&& get_measure_length = [](const LayoutLength& layout_length, const float available_length, const float fix_length) -> float + auto&& get_measure_length = [](const LayoutSideParams& layout_length, const float available_length, const float fix_length) -> float { switch (layout_length.mode) { |