DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Change the return type of getTrailingMargin to YGFloatOptional

Browse Source 
Summary: Change the return type of getTrailingMargin to YGFloatOptional

Reviewed By: emilsjolander

Differential Revision: D7350221

fbshipit-source-id: 61a67364c1975ec6dd1883bc2cb4968b830c73df
This commit is contained in:
Pritesh Nandgaonkar
2018-04-04 07:55:51 -07:00
committed by Facebook Github Bot
parent 6a77a6939e
commit 3c6c10075a
3 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
yoga/YGNode.cpp
View File

@@ -152,26 +152,25 @@ YGFloatOptional YGNode::getLeadingMargin(
widthSize);
}
float YGNode::getTrailingMargin(
const YGFlexDirection axis,
const float widthSize) const {
YGFloatOptional YGNode::getTrailingMargin(
const YGFlexDirection& axis,
const float& widthSize) const {
if (YGFlexDirectionIsRow(axis) &&
style_.margin[YGEdgeEnd].unit != YGUnitUndefined) {
return YGUnwrapFloatOptional(
YGResolveValueMargin(style_.margin[YGEdgeEnd], widthSize));
return YGResolveValueMargin(style_.margin[YGEdgeEnd], widthSize);
}
return YGUnwrapFloatOptional(YGResolveValueMargin(
return YGResolveValueMargin(
*YGComputedEdgeValue(style_.margin, trailing[axis], &YGValueZero),
widthSize));
widthSize);
}
// TODO: Make its return type to YGFloatOptional
float YGNode::getMarginForAxis(
const YGFlexDirection axis,
const float widthSize) const {
return YGUnwrapFloatOptional(getLeadingMargin(axis, widthSize)) +
getTrailingMargin(axis, widthSize);
return YGUnwrapFloatOptional(
getLeadingMargin(axis, widthSize) + getTrailingMargin(axis, widthSize));
}
// Setters
@@ -378,16 +377,16 @@ void YGNode::setPosition(
getLeadingMargin(mainAxis, ownerWidth) + relativePositionMain),
leading[mainAxis]);
setLayoutPosition(
getTrailingMargin(mainAxis, ownerWidth) +
YGUnwrapFloatOptional(relativePositionMain),
YGUnwrapFloatOptional(
getTrailingMargin(mainAxis, ownerWidth) + relativePositionMain),
trailing[mainAxis]);
setLayoutPosition(
YGUnwrapFloatOptional(
getLeadingMargin(crossAxis, ownerWidth) + relativePositionCross),
leading[crossAxis]);
setLayoutPosition(
getTrailingMargin(crossAxis, ownerWidth) +
YGUnwrapFloatOptional(relativePositionCross),
YGUnwrapFloatOptional(
getTrailingMargin(crossAxis, ownerWidth) + relativePositionCross),
trailing[crossAxis]);
}