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

Moved YGNodeIsFlex as a method on YGNode

Browse Source 
Summary: Moved YGNodeIsFlex as a method on YGNode

Reviewed By: emilsjolander

Differential Revision: D6711536

fbshipit-source-id: e60be7da55e3e8d254eb253c141d219a37a76087
This commit is contained in:
Pritesh Nandgaonkar
2018-01-15 10:09:43 -08:00
committed by Facebook Github Bot
parent a9dd527748
commit 5806f1728c
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
yoga/Yoga.cpp
View File

@@ -915,12 +915,6 @@ static float YGBaseline(const YGNodeRef node) {
return baseline + baselineChild->getLayout().position[YGEdgeTop];
}
static inline bool YGNodeIsFlex(const YGNodeRef node) {
return (
node->getStyle().positionType == YGPositionTypeRelative &&
(node->resolveFlexGrow() != 0 || node->resolveFlexShrink() != 0));
}
static bool YGIsBaselineLayout(const YGNodeRef node) {
if (YGFlexDirectionIsColumn(node->getStyle().flexDirection)) {
return false;
@@ -1611,7 +1605,7 @@ static void YGNodeComputeFlexBasisForChildren(
if (measureModeMainDim == YGMeasureModeExactly) {
for (auto child : children) {
if (singleFlexChild != nullptr) {
if (YGNodeIsFlex(child)) {
if (child->isNodeFlexible()) {
// There is already a flexible child, abort
singleFlexChild = nullptr;
break;
@@ -2033,7 +2027,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,
sizeConsumedOnCurrentLine += flexBasisWithMinAndMaxConstraints + childMarginMainAxis;
itemsOnLine++;
if (YGNodeIsFlex(child)) {
if (child->isNodeFlexible()) {
totalFlexGrowFactors += child->resolveFlexGrow();
// Unlike the grow factor, the shrink factor is scaled relative to the child dimension.