diff options
| author | crupest <crupest@outlook.com> | 2018-09-21 23:20:44 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2018-09-21 23:20:44 +0800 |
| commit | f9d3795e6dbb33fa5ffc0cb6e990462c4dd4974c (patch) | |
| tree | d7c7deb89c10944ccbdeafb4dd89ca492e4608b6 /CruUI/ui/controls/text_block.cpp | |
| parent | 82a45e611a2638cff7e3fffc09ba4569ca53a274 (diff) | |
| download | cru-f9d3795e6dbb33fa5ffc0cb6e990462c4dd4974c.tar.gz cru-f9d3795e6dbb33fa5ffc0cb6e990462c4dd4974c.tar.bz2 cru-f9d3795e6dbb33fa5ffc0cb6e990462c4dd4974c.zip | |
Move alignment property into layout params.
Diffstat (limited to 'CruUI/ui/controls/text_block.cpp')
| -rw-r--r-- | CruUI/ui/controls/text_block.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CruUI/ui/controls/text_block.cpp b/CruUI/ui/controls/text_block.cpp index 45f0d574..fa5e6903 100644 --- a/CruUI/ui/controls/text_block.cpp +++ b/CruUI/ui/controls/text_block.cpp @@ -206,7 +206,7 @@ namespace cru if (layout_params->width.mode == MeasureMode::Stretch && layout_params->height.mode == MeasureMode::Stretch) return available_size; - auto&& get_measure_length = [](const MeasureLength& layout_length, const float available_length) -> float + auto&& get_measure_length = [](const LayoutLength& layout_length, const float available_length) -> float { switch (layout_length.mode) { @@ -236,7 +236,7 @@ namespace cru const Size measure_result(metrics.width, metrics.height); - auto&& calculate_final_length = [](const MeasureLength& layout_length, const float measure_length, const float measure_result_length) -> float + auto&& calculate_final_length = [](const LayoutLength& layout_length, const float measure_length, const float measure_result_length) -> float { if ((layout_length.mode == MeasureMode::Stretch || layout_length.mode == MeasureMode::Exactly) |