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

Merge branch 'main' into export-D39929963

Browse Source
This commit is contained in:
Nick Gerleman
2023-01-16 08:03:32 -08:00
committed by GitHub
parent 8a33dd5750 83c6997f29
commit 5df80555f9
148 changed files with 3858 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/YGMeasureCacheTest.cpp
View File

@@ -19,8 +19,8 @@ static YGSize _measureMax(
(*measureCount)++;
return YGSize{
.width = widthMode == YGMeasureModeUndefined ? 10 : width,
.height = heightMode == YGMeasureModeUndefined ? 10 : height,
widthMode == YGMeasureModeUndefined ? 10 : width,
heightMode == YGMeasureModeUndefined ? 10 : height,
};
}
@@ -33,11 +33,11 @@ static YGSize _measureMin(
int* measureCount = (int*) node->getContext();
*measureCount = *measureCount + 1;
return YGSize{
.width = widthMode == YGMeasureModeUndefined ||
widthMode == YGMeasureModeUndefined ||
(widthMode == YGMeasureModeAtMost && width > 10)
? 10
: width,
.height = heightMode == YGMeasureModeUndefined ||
heightMode == YGMeasureModeUndefined ||
(heightMode == YGMeasureModeAtMost && height > 10)
? 10
: height,
@@ -55,10 +55,7 @@ static YGSize _measure_84_49(
(*measureCount)++;
}
return YGSize{
.width = 84.f,
.height = 49.f,
};
return YGSize{84.f, 49.f};
}
static YGSize _real_text_measurement_example(