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

Fix measure inner dimensions #1114

Closed
kinarobin wants to merge 3 commits from fix-flex-inner-main-dimension-measure into main
pull from: fix-flex-inner-main-dimension-measure
merge into: DaddyFrosty:main
Conversation 5 Commits 3 Files Changed 1 +2 -2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yoga/Yoga.cpp
View File

@@ -2952,10 +2952,10 @@ static void YGNodelayoutImpl(
availableInnerMainDim = maxInnerMainDim; availableInnerMainDim = maxInnerMainDim;
} else { } else {
rshest commented 2022-10-07 10:48:02 -07:00 (Migrated from github.com)
Review
Copy Link

Guess those extra parentheses are redundant, now that it's a list of OR clauses... granted, the expression is quite hard to unpack visually, and extra parentheses don't help here, quite an opposite

Guess those extra parentheses are redundant, now that it's a list of OR clauses... granted, the expression is quite hard to unpack visually, and extra parentheses don't help here, quite an opposite
rshest commented 2022-10-07 13:27:32 -07:00 (Migrated from github.com)
Review
Copy Link

I actually believe that the original intent there may have been to have it like this instead:

if (!node->getConfig()->useLegacyStretchBehaviour &&
            ((!YGFloatIsUndefined(
                  collectedFlexItemsValues.totalFlexGrowFactors) &&
              collectedFlexItemsValues.totalFlexGrowFactors == 0) ||
             (!YGFloatIsUndefined(node->resolveFlexGrow()) &&
              node->resolveFlexGrow() == 0))) {
I actually believe that the original intent there may have been to have it like this instead: ```c++ if (!node->getConfig()->useLegacyStretchBehaviour && ((!YGFloatIsUndefined( collectedFlexItemsValues.totalFlexGrowFactors) && collectedFlexItemsValues.totalFlexGrowFactors == 0) || (!YGFloatIsUndefined(node->resolveFlexGrow()) && node->resolveFlexGrow() == 0))) { ```
kinarobin commented 2022-10-07 20:39:57 -07:00 (Migrated from github.com)
Review
Copy Link

Yeah, you're right. I had update this code.

Yeah, you're right. I had update this code.
if (!node->getConfig()->useLegacyStretchBehaviour && if (!node->getConfig()->useLegacyStretchBehaviour &&
((YGFloatIsUndefined( ((!YGFloatIsUndefined(
collectedFlexItemsValues.totalFlexGrowFactors) && collectedFlexItemsValues.totalFlexGrowFactors) &&
collectedFlexItemsValues.totalFlexGrowFactors == 0) || collectedFlexItemsValues.totalFlexGrowFactors == 0) ||
(YGFloatIsUndefined(node->resolveFlexGrow()) && (!YGFloatIsUndefined(node->resolveFlexGrow()) &&
node->resolveFlexGrow() == 0))) { node->resolveFlexGrow() == 0))) {
// If we don't have any children to flex or we can't flex the node // 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 // itself, space we've used is all space we need. Root node also