Skip to content

Commit

Permalink
Rename ambiguous getLeading/Trailing... functions in Node.cpp (#1424)
Browse files Browse the repository at this point in the history
Summary:
X-link: facebook/react-native#41018

Pull Request resolved: #1424

See D50344874

Reviewed By: NickGerleman

Differential Revision: D50344874

fbshipit-source-id: 1a24ae1cdb9374cd7b84895fb7d5ea6bc9507bb1
  • Loading branch information
joevilches authored and facebook-github-bot committed Oct 17, 2023
1 parent 0af9aef commit 3b4169a
Show file tree
Hide file tree
Showing 4 changed files with 126 additions and 124 deletions.
4 changes: 2 additions & 2 deletions yoga/algorithm/BoundAxis.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ inline float paddingAndBorderForAxis(
const yoga::Node* const node,
const FlexDirection axis,
const float widthSize) {
return node->getLeadingPaddingAndBorder(axis, widthSize) +
node->getTrailingPaddingAndBorder(axis, widthSize);
return node->getFlexStartPaddingAndBorder(axis, widthSize) +
node->getFlexEndPaddingAndBorder(axis, widthSize);
}

inline FloatOptional boundAxisWithinMinAndMax(
Expand Down
Loading

0 comments on commit 3b4169a

Please sign in to comment.