Fix align-content:strech overriding align-item

woehrl01 · facebook-github-bot · commit 684cc4a3e586 · 2017-02-23T08:31:05.000-08:00
Summary: Fix for #413. This was a hangover from a previous attept to fix other align-content problems. Closes facebook/yoga#417 Reviewed By: astreet Differential Revision: D4604727 Pulled By: emilsjolander fbshipit-source-id: 92fd31a385d8182c6b201c891d5ae478372d525d
diff --git a/Yoga.c b/Yoga.c
@@ -2666,8 +2666,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,
   }
 
   // STEP 8: MULTI-LINE CONTENT ALIGNMENT
-  if (performLayout &&
-      (lineCount > 1 || node->style.alignContent == YGAlignStretch || YGIsBaselineLayout(node)) &&
+  if (performLayout && (lineCount > 1 || YGIsBaselineLayout(node)) &&
       !YGFloatIsUndefined(availableInnerCrossDim)) {
     const float remainingAlignContentDim = availableInnerCrossDim - totalLineCrossDim;
 

Original file line number	Diff line number	Diff line change
`@@ -2666,8 +2666,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,`
`2666`	`2666`	`}`
`2667`	`2667`
`2668`	`2668`	`// STEP 8: MULTI-LINE CONTENT ALIGNMENT`
`2669`		`- if (performLayout &&`
`2670`		`- (lineCount > 1 \|\| node->style.alignContent == YGAlignStretch \|\| YGIsBaselineLayout(node)) &&`
	`2669`	`+ if (performLayout && (lineCount > 1 \|\| YGIsBaselineLayout(node)) &&`
`2671`	`2670`	`!YGFloatIsUndefined(availableInnerCrossDim)) {`
`2672`	`2671`	`const float remainingAlignContentDim = availableInnerCrossDim - totalLineCrossDim;`
`2673`	`2672`