diff --git a/frameworks/core/components_ng/base/frame_node.cpp b/frameworks/core/components_ng/base/frame_node.cpp index 21be2ae1dac2104ffcb2fdba0629b143735592dd..16ec4c8e75298477f11202075ab0e89ebfae8d68 100644 --- a/frameworks/core/components_ng/base/frame_node.cpp +++ b/frameworks/core/components_ng/base/frame_node.cpp @@ -752,24 +752,6 @@ void FrameNode::DumpCommonInfo() DumpLog::GetInstance().AddDesc(std::string("FrameRect: ").append(geometryNode_->GetFrameRect().ToString())); DumpLog::GetInstance().AddDesc( std::string("PaintRect without transform: ").append(renderContext_->GetPaintRectWithoutTransform().ToString())); - if (GetHostTag() == V2::COLUMN_ETS_TAG || GetHostTag() == V2::ROW_ETS_TAG) { - auto widthLayoutPolicy = AceType::DynamicCast(layoutProperty_) - ->GetWidthLayoutPolicy() - .value_or(static_cast(LayoutCalPolicy::NO_MATCH)); - auto heightLayoutPolicy = AceType::DynamicCast(layoutProperty_) - ->GetHeightLayoutPolicy() - .value_or(static_cast(LayoutCalPolicy::NO_MATCH)); - std::string layoutPolicy = ""; - if (widthLayoutPolicy != static_cast(LayoutCalPolicy::NO_MATCH)) { - layoutPolicy.append("WidthLayoutPolicy: ").append(std::to_string(widthLayoutPolicy)); - } - if (heightLayoutPolicy != static_cast(LayoutCalPolicy::NO_MATCH)) { - layoutPolicy.append("HeightLayoutPolicy: ").append(std::to_string(heightLayoutPolicy)); - } - if (layoutPolicy.length() > 0) { - DumpLog::GetInstance().AddDesc(layoutPolicy); - } - } if (renderContext_->GetBackgroundColor()->ColorToString().compare("#00000000") != 0) { DumpLog::GetInstance().AddDesc( std::string("BackgroundColor: ").append(renderContext_->GetBackgroundColor()->ColorToString())); diff --git a/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp b/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp index 65524f59a111e676e408c627f9d8e43c31d8af9f..eb8a6a45dfc4559c470b05f0eb28e26e85cd1cc8 100644 --- a/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp +++ b/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp @@ -309,10 +309,12 @@ void FlexLayoutAlgorithm::TravelChildrenFlexProps(LayoutWrapper* layoutWrapper) bool FlexLayoutAlgorithm::AddElementIntoLayoutPolicyChildren(LayoutWrapper* layoutWrapper, RefPtr child) { - auto widthLayoutPolicy = - AceType::DynamicCast(child->GetLayoutProperty())->GetWidthLayoutPolicy(); - auto heightLayoutPolicy = - AceType::DynamicCast(child->GetLayoutProperty())->GetHeightLayoutPolicy(); + CHECK_NULL_RETURN(layoutWrapper, false); + CHECK_NULL_RETURN(child, false); + auto childLayoutProperty = AceType::DynamicCast(child->GetLayoutProperty()); + CHECK_NULL_RETURN(childLayoutProperty, false); + auto widthLayoutPolicy = childLayoutProperty->GetWidthLayoutPolicy(); + auto heightLayoutPolicy = childLayoutProperty->GetHeightLayoutPolicy(); if (widthLayoutPolicy.value_or(static_cast(LayoutCalPolicy::NO_MATCH)) == static_cast(LayoutCalPolicy::NO_MATCH) && heightLayoutPolicy.value_or(static_cast(LayoutCalPolicy::NO_MATCH)) == @@ -350,10 +352,10 @@ void FlexLayoutAlgorithm::MeasureAdaptiveLayoutChildren(LayoutWrapper* layoutWra child->Measure(layoutConstraint); auto geometryNode = child->GetGeometryNode(); CHECK_NULL_CONTINUE(geometryNode); - auto widthLayoutPolicy = - AceType::DynamicCast(child->GetLayoutProperty())->GetWidthLayoutPolicy(); - auto heightLayoutPolicy = - AceType::DynamicCast(child->GetLayoutProperty())->GetHeightLayoutPolicy(); + auto childLayoutProperty = AceType::DynamicCast(child->GetLayoutProperty()); + CHECK_NULL_CONTINUE(childLayoutProperty); + auto widthLayoutPolicy = childLayoutProperty->GetWidthLayoutPolicy(); + auto heightLayoutPolicy = childLayoutProperty->GetHeightLayoutPolicy(); if (widthLayoutPolicy.value_or(static_cast(LayoutCalPolicy::NO_MATCH)) == static_cast(LayoutCalPolicy::MATCH_PARENT)) { geometryNode->SetFrameWidth(realSize.Width()); diff --git a/frameworks/core/components_ng/pattern/linear_layout/linear_layout_pattern.h b/frameworks/core/components_ng/pattern/linear_layout/linear_layout_pattern.h index 2f83a277764067bee85a7db64a7bfb6464f6ee89..b57d952cbb22beb1323f1ae82b60b4fb2828bdf1 100644 --- a/frameworks/core/components_ng/pattern/linear_layout/linear_layout_pattern.h +++ b/frameworks/core/components_ng/pattern/linear_layout/linear_layout_pattern.h @@ -105,6 +105,21 @@ public: if (space.has_value()) { DumpLog::GetInstance().AddDesc(std::string("space: ").append(space.value().ToString().c_str())); } + auto widthLayoutPolicy = layoutProperty->GetWidthLayoutPolicy(); + auto heightLayoutPolicy = layoutProperty->GetHeightLayoutPolicy(); + std::string layoutPolicy = ""; + if (widthLayoutPolicy.has_value() && + widthLayoutPolicy.value() != static_cast(LayoutCalPolicy::NO_MATCH)) { + layoutPolicy.append("WidthLayoutPolicy: ").append(std::to_string(widthLayoutPolicy.value())); + } + if (heightLayoutPolicy.has_value() && + heightLayoutPolicy.value() != static_cast(LayoutCalPolicy::NO_MATCH)) { + layoutPolicy.append(layoutPolicy.length() == 0 ? "HeightLayoutPolicy: " : " HeightLayoutPolicy: ") + .append(std::to_string(heightLayoutPolicy.value())); + } + if (layoutPolicy.length() > 0) { + DumpLog::GetInstance().AddDesc(layoutPolicy); + } } void DumpSimplifyInfo(std::unique_ptr& json) override