From 67e1d1e812b69b3a887e65c5ca71966b66cb96da Mon Sep 17 00:00:00 2001 From: Joe Vilches Date: Mon, 6 Nov 2023 10:05:22 -0800 Subject: [PATCH] Simplify getting padding + border for cross axis in algorithm (#41208) Summary: X-link: https://github.com/facebook/yoga/pull/1437 Reading through the sizing logic and this seemed a bit redundant/confusing. Lets use the same function we just used for the main axis for the cross axis as well so people do not think its special. Also we will need one less variable. The reason this was done it seems is because we need the leading padding + border elsewhere so this is technically a few less steps but this is cleaner Reviewed By: NickGerleman Differential Revision: D50704177 --- .../ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp b/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp index 123ade22a57d5c..3f4af2d3b8a75c 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp +++ b/packages/react-native/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp @@ -1612,12 +1612,10 @@ static void calculateLayoutImpl( const float paddingAndBorderAxisMain = paddingAndBorderForAxis(node, mainAxis, ownerWidth); + const float paddingAndBorderAxisCross = + paddingAndBorderForAxis(node, crossAxis, ownerWidth); const float leadingPaddingAndBorderCross = node->getInlineStartPaddingAndBorder(crossAxis, direction, ownerWidth); - const float trailingPaddingAndBorderCross = - node->getInlineEndPaddingAndBorder(crossAxis, direction, ownerWidth); - const float paddingAndBorderAxisCross = - leadingPaddingAndBorderCross + trailingPaddingAndBorderCross; MeasureMode measureModeMainDim = isMainAxisRow ? widthMeasureMode : heightMeasureMode;