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

More niche box sizing tests #1712

Closed
joevilches wants to merge 4 commits from export-D63423302 into main
pull from: export-D63423302
merge into: DaddyFrosty:main
Conversation 3 Commits 4 Files Changed 12 +23 -27
4 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b7cfdf7162 - Show all commits

4
yoga/algorithm/CalculateLayout.cpp
View File

@@ -2360,7 +2360,7 @@ void calculateLayout(
const auto& style = node->style(); const auto& style = node->style();
if (node->hasDefiniteLength(Dimension::Width, ownerWidth)) { if (node->hasDefiniteLength(Dimension::Width, ownerWidth)) {
width = width =
(node->getProcessedDimension(dimension(FlexDirection::Row)) (node->getProcessedDimension(Dimension::Width)
.resolve(ownerWidth) .resolve(ownerWidth)
.unwrap() + .unwrap() +
node->style().computeMarginForAxis(FlexDirection::Row, ownerWidth)); node->style().computeMarginForAxis(FlexDirection::Row, ownerWidth));
@@ -2380,7 +2380,7 @@ void calculateLayout(
SizingMode heightSizingMode = SizingMode::MaxContent; SizingMode heightSizingMode = SizingMode::MaxContent;
if (node->hasDefiniteLength(Dimension::Height, ownerHeight)) { if (node->hasDefiniteLength(Dimension::Height, ownerHeight)) {
height = height =
(node->getProcessedDimension(dimension(FlexDirection::Column)) (node->getProcessedDimension(Dimension::Height)
.resolve(ownerHeight) .resolve(ownerHeight)
.unwrap() + .unwrap() +
node->style().computeMarginForAxis(FlexDirection::Column, ownerWidth)); node->style().computeMarginForAxis(FlexDirection::Column, ownerWidth));