From ced1a63686e6c64cb574d74a34d1bbd07d0a668e Mon Sep 17 00:00:00 2001 From: crupest Date: Mon, 21 Feb 2022 18:44:40 +0800 Subject: ... --- src/ui/render/FlexLayoutRenderObject.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/ui/render/FlexLayoutRenderObject.cpp') diff --git a/src/ui/render/FlexLayoutRenderObject.cpp b/src/ui/render/FlexLayoutRenderObject.cpp index 0699768a..988e7590 100644 --- a/src/ui/render/FlexLayoutRenderObject.cpp +++ b/src/ui/render/FlexLayoutRenderObject.cpp @@ -1,6 +1,6 @@ #include "cru/ui/render/FlexLayoutRenderObject.h" -#include "cru/common/Logger.h" +#include "cru/common/log/Logger.h" #include "cru/ui/render/LayoutHelper.h" #include @@ -90,7 +90,7 @@ Size FlexLayoutMeasureContentImpl( const MeasureRequirement& requirement, const MeasureSize& preferred_size, const std::vector& children, const std::vector& layout_data, - Alignment item_cross_align, StringView log_tag) { + Alignment item_cross_align, String kLogTag) { Expects(children.size() == layout_data.size()); direction_tag_t direction_tag; @@ -300,8 +300,7 @@ Size FlexLayoutMeasureContentImpl( if (max_main_length.IsSpecified() && total_length > max_main_length.GetLengthOrUndefined()) { - log::TagWarn( - log_tag, + CRU_LOG_WARN( u"(Measure) Children's main axis length exceeds required max length."); total_length = max_main_length.GetLengthOrUndefined(); } else if (min_main_length.IsSpecified() && @@ -345,11 +344,11 @@ Size FlexLayoutRenderObject::OnMeasureContent( if (horizontal) { return FlexLayoutMeasureContentImpl( requirement, preferred_size, children, layout_data_list, - item_cross_align_, log_tag); + item_cross_align_, kLogTag); } else { return FlexLayoutMeasureContentImpl( requirement, preferred_size, children, layout_data_list, - item_cross_align_, log_tag); + item_cross_align_, kLogTag); } } -- cgit v1.2.3