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

Change the type of flex to YGFloatOptional

Browse Source 
Summary: Change the type of flex to YGFloatOptional internally, but keeping the public facing API the same as before

Reviewed By: emilsjolander

Differential Revision: D7211327

fbshipit-source-id: 0d979b6ba00317317b98bbc6e63979c7f1feb2da
This commit is contained in:
Pritesh Nandgaonkar
2018-03-14 04:17:09 -07:00
committed by Facebook Github Bot
parent b3f8851bc2
commit 2232d7603a
8 changed files with 61 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
yoga/YGNode.cpp
View File

@@ -500,7 +500,7 @@ YGValue YGNode::resolveFlexBasisPtr() const {
if (flexBasis.unit != YGUnitAuto && flexBasis.unit != YGUnitUndefined) {
return flexBasis;
}
if (!YGFloatIsUndefined(style_.flex) && style_.flex > 0.0f) {
if (!style_.flex.isUndefined && style_.flex.value > 0.0f) {
return config_->useWebDefaults ? YGValueAuto : YGValueZero;
}
return YGValueAuto;
@@ -595,8 +595,8 @@ float YGNode::resolveFlexGrow() {
if (!YGFloatIsUndefined(style_.flexGrow)) {
return style_.flexGrow;
}
if (!YGFloatIsUndefined(style_.flex) && style_.flex > 0.0f) {
return style_.flex;
if (!style_.flex.isUndefined && style_.flex.value > 0.0f) {
return style_.flex.value;
}
return kDefaultFlexGrow;
}
@@ -608,9 +608,9 @@ float YGNode::resolveFlexShrink() {
if (!YGFloatIsUndefined(style_.flexShrink)) {
return style_.flexShrink;
}
if (!config_->useWebDefaults && !YGFloatIsUndefined(style_.flex) &&
style_.flex < 0.0f) {
return -style_.flex;
if (!config_->useWebDefaults && !style_.flex.isUndefined &&
style_.flex.value < 0.0f) {
return -style_.flex.value;
}
return config_->useWebDefaults ? kWebDefaultFlexShrink : kDefaultFlexShrink;
}