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

YGNodeBoundAxisWithinMinAndMax accepts YGFloatOptional

Browse Source 
Summary:
@public

Saves some calls to `.unwrap()`

Reviewed By: SidharthGuglani

Differential Revision: D13439600

fbshipit-source-id: ce0f6bad9a0709e9d64e23d8349bc2423b9b2ad4
This commit is contained in:
David Aurelio
2018-12-13 07:09:31 -08:00
committed by Facebook Github Bot
parent 852db1d885
commit e96d14395c
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
yoga/Yoga.cpp
View File

@@ -1212,7 +1212,7 @@ static inline bool YGNodeIsLayoutDimDefined(
static YGFloatOptional YGNodeBoundAxisWithinMinAndMax(
const YGNodeRef node,
const YGFlexDirection axis,
const float value,
const YGFloatOptional value,
const float axisSize) {
YGFloatOptional min;
YGFloatOptional max;
@@ -1229,15 +1229,15 @@ static YGFloatOptional YGNodeBoundAxisWithinMinAndMax(
node->getStyle().maxDimensions[YGDimensionWidth], axisSize);
}
if (!max.isUndefined() && max.unwrap() >= 0 && value > max.unwrap()) {
if (max >= YGFloatOptional{0} && value > max) {
return max;
}
if (!min.isUndefined() && min.unwrap() >= 0 && value < min.unwrap()) {
if (min >= YGFloatOptional{0} && value < min) {
return min;
}
return YGFloatOptional(value);
return value;
}
// Like YGNodeBoundAxisWithinMinAndMax but also ensures that the value doesn't
@@ -1249,7 +1249,9 @@ static inline float YGNodeBoundAxis(
const float axisSize,
const float widthSize) {
return YGFloatMax(
YGNodeBoundAxisWithinMinAndMax(node, axis, value, axisSize).unwrap(),
YGNodeBoundAxisWithinMinAndMax(
node, axis, YGFloatOptional{value}, axisSize)
.unwrap(),
YGNodePaddingAndBorderForAxis(node, axis, widthSize));
}
@@ -2021,7 +2023,7 @@ static YGCollectFlexItemsRowValues YGCalculateCollectFlexItemsRowValues(
YGNodeBoundAxisWithinMinAndMax(
child,
mainAxis,
child->getLayout().computedFlexBasis.unwrap(),
child->getLayout().computedFlexBasis,
mainAxisownerSize)
.unwrap();
@@ -2096,11 +2098,10 @@ static float YGDistributeFreeSpaceSecondPass(
const bool isNodeFlexWrap = node->getStyle().flexWrap != YGWrapNoWrap;
for (auto currentRelativeChild : collectedFlexItemsValues.relativeChildren) {
childFlexBasis =
YGNodeBoundAxisWithinMinAndMax(
childFlexBasis = YGNodeBoundAxisWithinMinAndMax(
currentRelativeChild,
mainAxis,
currentRelativeChild->getLayout().computedFlexBasis.unwrap(),
currentRelativeChild->getLayout().computedFlexBasis,
mainAxisownerSize)
.unwrap();
float updatedMainSize = childFlexBasis;
@@ -2280,7 +2281,7 @@ static void YGDistributeFreeSpaceFirstPass(
YGNodeBoundAxisWithinMinAndMax(
currentRelativeChild,
mainAxis,
currentRelativeChild->getLayout().computedFlexBasis.unwrap(),
currentRelativeChild->getLayout().computedFlexBasis,
mainAxisownerSize)
.unwrap();
@@ -3458,7 +3459,10 @@ static void YGNodelayoutImpl(
YGFloatMin(
availableInnerMainDim + paddingAndBorderAxisMain,
YGNodeBoundAxisWithinMinAndMax(
node, mainAxis, maxLineMainDim, mainAxisownerSize)
node,
mainAxis,
YGFloatOptional{maxLineMainDim},
mainAxisownerSize)
.unwrap()),
paddingAndBorderAxisMain),
dim[mainAxis]);
@@ -3488,7 +3492,8 @@ static void YGNodelayoutImpl(
YGNodeBoundAxisWithinMinAndMax(
node,
crossAxis,
totalLineCrossDim + paddingAndBorderAxisCross,
YGFloatOptional{totalLineCrossDim +
paddingAndBorderAxisCross},
crossAxisownerSize)
.unwrap()),
paddingAndBorderAxisCross),