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

Simplified logic distributing flex space.

Browse Source
This commit is contained in:
Russell Keith-Magee
2015-03-31 18:58:56 +08:00
parent c523b7c404
commit 2b6844f00a
3 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Layout.js
View File

@@ -501,15 +501,9 @@ var computeLayout = (function() {
if (isFlex(child)) {
// At this point we know the final size of the element in the main
// dimension
baseMainDim = flexibleMainDim * getFlex(child) +
getPaddingAndBorderAxis(child, mainAxis);
boundMainDim = boundAxis(child, mainAxis, baseMainDim);
if (baseMainDim === boundMainDim) {
child.layout[dim[mainAxis]] = baseMainDim;
} else {
child.layout[dim[mainAxis]] = boundMainDim;
}
child.layout[dim[mainAxis]] = boundAxis(child, mainAxis,
flexibleMainDim * getFlex(child) + getPaddingAndBorderAxis(child, mainAxis)
);
maxWidth = CSS_UNDEFINED;
if (isDimDefined(node, CSS_FLEX_DIRECTION_ROW)) {