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

WIP: FloatOptional GCC build fix and more constexpr #1411

Closed
NickGerleman wants to merge 22 commits from NickGerleman-fix-gcc-floatoptional into main
pull from: NickGerleman-fix-gcc-floatoptional
merge into: DaddyFrosty:main
Conversation 3 Commits 22 Files Changed 4 +45 -44
4 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c98a08e973 - Show all commits

2
yoga/algorithm/CalculateLayout.cpp
View File

@@ -1223,7 +1223,7 @@ static void justifyMainAxis(
const float occupiedSpaceByChildNodes = const float occupiedSpaceByChildNodes =
availableInnerMainDim - flexLine.layout.remainingFreeSpace; availableInnerMainDim - flexLine.layout.remainingFreeSpace;
flexLine.layout.remainingFreeSpace = yoga::maxOrDefined( flexLine.layout.remainingFreeSpace = yoga::maxOrDefined(
0, minAvailableMainDim - occupiedSpaceByChildNodes); 0.0f, minAvailableMainDim - occupiedSpaceByChildNodes);
} else { } else {
flexLine.layout.remainingFreeSpace = 0; flexLine.layout.remainingFreeSpace = 0;
} }