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

Change the type of getTrailingPosition to YGFloatOptional

Browse Source 
Summary: Change the type of getTrailingPosition to YGFloatOptional

Reviewed By: emilsjolander

Differential Revision: D7344710

fbshipit-source-id: eb4c422b6e0f55d90b083221aa8ff1ab797d58a8
This commit is contained in:
Pritesh Nandgaonkar
2018-04-04 07:55:44 -07:00
committed by Facebook Github Bot
parent 572546088f
commit 2b714a5b5d
3 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
yoga/YGNode.cpp
View File

@@ -104,14 +104,14 @@ YGFloatOptional YGNode::getLeadingPosition(
: YGResolveValue(*leadingPosition, axisSize);
}
float YGNode::getTrailingPosition(
const YGFlexDirection axis,
const float axisSize) const {
YGFloatOptional YGNode::getTrailingPosition(
const YGFlexDirection& axis,
const float& axisSize) const {
if (YGFlexDirectionIsRow(axis)) {
const YGValue* trailingPosition =
YGComputedEdgeValue(style_.position, YGEdgeEnd, &YGValueUndefined);
if (trailingPosition->unit != YGUnitUndefined) {
return YGUnwrapFloatOptional(YGResolveValue(*trailingPosition, axisSize));
return YGResolveValue(*trailingPosition, axisSize);
}
}
@@ -119,8 +119,8 @@ float YGNode::getTrailingPosition(
YGComputedEdgeValue(style_.position, trailing[axis], &YGValueUndefined);
return trailingPosition->unit == YGUnitUndefined
? 0.0f
: YGUnwrapFloatOptional(YGResolveValue(*trailingPosition, axisSize));
? YGFloatOptional(0)
: YGResolveValue(*trailingPosition, axisSize);
}
bool YGNode::isLeadingPositionDefined(const YGFlexDirection axis) const {
@@ -345,7 +345,7 @@ float YGNode::relativePosition(
const float axisSize) {
return isLeadingPositionDefined(axis)
? YGUnwrapFloatOptional(getLeadingPosition(axis, axisSize))
: -getTrailingPosition(axis, axisSize);
: -YGUnwrapFloatOptional(getTrailingPosition(axis, axisSize));
}
void YGNode::setPosition(