From f9d3795e6dbb33fa5ffc0cb6e990462c4dd4974c Mon Sep 17 00:00:00 2001 From: crupest Date: Fri, 21 Sep 2018 23:20:44 +0800 Subject: Move alignment property into layout params. --- CruUI/ui/controls/text_block.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CruUI/ui/controls/text_block.cpp') 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) -- cgit v1.2.3