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

Moved YGResolveFlexGrow as a method on YGNode

Browse Source 
Summary: Moved YGResolveFlexGrow as a method on YGNode

Reviewed By: emilsjolander

Differential Revision: D6611385

fbshipit-source-id: 71660946c469fac77c5ffa0284c793e6adc9db7b
This commit is contained in:
Pritesh Nandgaonkar
2018-01-08 02:48:37 -08:00
committed by Facebook Github Bot
parent 47892c17ce
commit 40eeefd4f7
3 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
yoga/YGNode.cpp
View File

@@ -421,3 +421,17 @@ void YGNode::markDirtyAndPropogate() {
} }
} }
} }
float YGNode::resolveFlexGrow() {
// Root nodes flexGrow should always be 0
if (parent_ == nullptr) {
return 0.0;
}
if (!YGFloatIsUndefined(style_.flexGrow)) {
return style_.flexGrow;
}
if (!YGFloatIsUndefined(style_.flex) && style_.flex > 0.0f) {
return style_.flex;
}
return kDefaultFlexGrow;
}

1
yoga/YGNode.h
View File

@@ -122,4 +122,5 @@ struct YGNode {
// Other methods // Other methods
void cloneChildrenIfNeeded(); void cloneChildrenIfNeeded();
void markDirtyAndPropogate(); void markDirtyAndPropogate();
float resolveFlexGrow();
}; };

29
yoga/Yoga.cpp
View File

@@ -457,21 +457,6 @@ void YGNodeCopyStyle(const YGNodeRef dstNode, const YGNodeRef srcNode) {
} }
} }
static inline float YGResolveFlexGrow(const YGNodeRef node) {
// Root nodes flexGrow should always be 0
if (node->getParent() == nullptr) {
return 0.0;
}
if (!YGFloatIsUndefined(node->getStyle().flexGrow)) {
return node->getStyle().flexGrow;
}
if (!YGFloatIsUndefined(node->getStyle().flex) &&
node->getStyle().flex > 0.0f) {
return node->getStyle().flex;
}
return kDefaultFlexGrow;
}
float YGNodeStyleGetFlexGrow(const YGNodeRef node) { float YGNodeStyleGetFlexGrow(const YGNodeRef node) {
return YGFloatIsUndefined(node->getStyle().flexGrow) return YGFloatIsUndefined(node->getStyle().flexGrow)
? kDefaultFlexGrow ? kDefaultFlexGrow
@@ -1036,7 +1021,7 @@ static YGFlexDirection YGFlexDirectionCross(const YGFlexDirection flexDirection,
static inline bool YGNodeIsFlex(const YGNodeRef node) { static inline bool YGNodeIsFlex(const YGNodeRef node) {
return ( return (
node->getStyle().positionType == YGPositionTypeRelative && node->getStyle().positionType == YGPositionTypeRelative &&
(YGResolveFlexGrow(node) != 0 || YGNodeResolveFlexShrink(node) != 0)); (node->resolveFlexGrow() != 0 || YGNodeResolveFlexShrink(node) != 0));
} }
static bool YGIsBaselineLayout(const YGNodeRef node) { static bool YGIsBaselineLayout(const YGNodeRef node) {
@@ -2041,7 +2026,9 @@ static void YGNodelayoutImpl(const YGNodeRef node,
singleFlexChild = nullptr; singleFlexChild = nullptr;
break; break;
} }
} else if (YGResolveFlexGrow(child) > 0.0f && YGNodeResolveFlexShrink(child) > 0.0f) { } else if (
child->resolveFlexGrow() > 0.0f &&
YGNodeResolveFlexShrink(child) > 0.0f) {
singleFlexChild = child; singleFlexChild = child;
} }
} }
@@ -2186,7 +2173,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,
itemsOnLine++; itemsOnLine++;
if (YGNodeIsFlex(child)) { if (YGNodeIsFlex(child)) {
totalFlexGrowFactors += YGResolveFlexGrow(child); totalFlexGrowFactors += child->resolveFlexGrow();
// Unlike the grow factor, the shrink factor is scaled relative to the child dimension. // Unlike the grow factor, the shrink factor is scaled relative to the child dimension.
totalFlexShrinkScaledFactors += -YGNodeResolveFlexShrink(child) * totalFlexShrinkScaledFactors += -YGNodeResolveFlexShrink(child) *
@@ -2240,7 +2227,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,
availableInnerMainDim = maxInnerMainDim; availableInnerMainDim = maxInnerMainDim;
} else { } else {
if (!node->getConfig()->useLegacyStretchBehaviour && if (!node->getConfig()->useLegacyStretchBehaviour &&
(totalFlexGrowFactors == 0 || YGResolveFlexGrow(node) == 0)) { (totalFlexGrowFactors == 0 || node->resolveFlexGrow() == 0)) {
// If we don't have any children to flex or we can't flex the node itself, // If we don't have any children to flex or we can't flex the node itself,
// space we've used is all space we need. Root node also should be shrunk to minimum // space we've used is all space we need. Root node also should be shrunk to minimum
availableInnerMainDim = sizeConsumedOnCurrentLine; availableInnerMainDim = sizeConsumedOnCurrentLine;
@@ -2333,7 +2320,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,
} }
} }
} else if (remainingFreeSpace > 0) { } else if (remainingFreeSpace > 0) {
flexGrowFactor = YGResolveFlexGrow(currentRelativeChild); flexGrowFactor = currentRelativeChild->resolveFlexGrow();
// Is this child able to grow? // Is this child able to grow?
if (flexGrowFactor != 0) { if (flexGrowFactor != 0) {
@@ -2402,7 +2389,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,
availableInnerWidth); availableInnerWidth);
} }
} else if (remainingFreeSpace > 0) { } else if (remainingFreeSpace > 0) {
flexGrowFactor = YGResolveFlexGrow(currentRelativeChild); flexGrowFactor = currentRelativeChild->resolveFlexGrow();
// Is this child able to grow? // Is this child able to grow?
if (flexGrowFactor != 0) { if (flexGrowFactor != 0) {