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

Move justifyContent check into switch statement

Browse Source 
Summary: some general cleanup

Reviewed By: lucasr

Differential Revision: D3886861

fbshipit-source-id: 17ba2962016af34b5add3ce6d8355c9c305a35c0
This commit is contained in:
Emil Sjolander
2016-09-20 10:16:15 -07:00
committed by Facebook Github Bot 5
parent 1415a5d7fd
commit 8fd14c710c
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CSSLayout/CSSLayout.c
View File

@@ -1497,25 +1497,27 @@ static void layoutNodeImpl(const CSSNodeRef node,
remainingFreeSpace = 0; remainingFreeSpace = 0;
} }
// Use justifyContent to figure out how to allocate the remaining space switch (justifyContent) {
// available in the main axis. case CSSJustifyCenter:
if (justifyContent != CSSJustifyFlexStart) {
if (justifyContent == CSSJustifyCenter) {
leadingMainDim = remainingFreeSpace / 2; leadingMainDim = remainingFreeSpace / 2;
} else if (justifyContent == CSSJustifyFlexEnd) { break;
case CSSJustifyFlexEnd:
leadingMainDim = remainingFreeSpace; leadingMainDim = remainingFreeSpace;
} else if (justifyContent == CSSJustifySpaceBetween) { break;
remainingFreeSpace = fmaxf(remainingFreeSpace, 0); case CSSJustifySpaceBetween:
if (itemsOnLine > 1) { if (itemsOnLine > 1) {
betweenMainDim = remainingFreeSpace / (itemsOnLine - 1); betweenMainDim = fmaxf(remainingFreeSpace, 0) / (itemsOnLine - 1);
} else { } else {
betweenMainDim = 0; betweenMainDim = 0;
} }
} else if (justifyContent == CSSJustifySpaceAround) { break;
case CSSJustifySpaceAround:
// Space on the edges is half of the space between elements // Space on the edges is half of the space between elements
betweenMainDim = remainingFreeSpace / itemsOnLine; betweenMainDim = remainingFreeSpace / itemsOnLine;
leadingMainDim = betweenMainDim / 2; leadingMainDim = betweenMainDim / 2;
} break;
default:
break;
} }
float mainDim = leadingPaddingAndBorderMain + leadingMainDim; float mainDim = leadingPaddingAndBorderMain + leadingMainDim;

2
format.sh
View File

@@ -6,7 +6,7 @@ clang-format \
AlignOperands: true, \ AlignOperands: true, \
AllowAllParametersOfDeclarationOnNextLine: false, \ AllowAllParametersOfDeclarationOnNextLine: false, \
AllowShortBlocksOnASingleLine: false, \ AllowShortBlocksOnASingleLine: false, \
AllowShortCaseLabelsOnASingleLine: true, \ AllowShortCaseLabelsOnASingleLine: false, \
AllowShortFunctionsOnASingleLine: false, \ AllowShortFunctionsOnASingleLine: false, \
AllowShortIfStatementsOnASingleLine: false, \ AllowShortIfStatementsOnASingleLine: false, \
AllowShortLoopsOnASingleLine: false, \ AllowShortLoopsOnASingleLine: false, \