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

WIP: Fix missing invalidation if owner has undefined dimensions #1017

Draft
woehrl01 wants to merge 2 commits from woehrl01/fix-invalidate-owner-size into main
pull from: woehrl01/fix-invalidate-owner-size
merge into: DaddyFrosty:main
Conversation 8 Commits 2 Files Changed 3 +41 -1
3 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/YGRelayoutTest.cpp
View File

@@ -49,3 +49,33 @@ TEST(YogaTest, recalculate_resolvedDimonsion_onchange) {
YGNodeFreeRecursive(root);
}
YGSize _measureRecalc(YGNodeRef node, float width, YGMeasureMode widthMode, float height, YGMeasureMode heightMode) {
return YGSize { 0, 0};
}
TEST(YogaTest, recalculate_on_layout_values_change) {
const YGConfigRef config = YGConfigNew();
YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeatureWebFlexBasis, true);
YGConfigSetPointScaleFactor(config, 3.f);
const YGNodeRef root = YGNodeNewWithConfig(config);
YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow);
YGNodeStyleSetAlignItems(root, YGAlignFlexStart);
YGNodeStyleSetAlignContent(root, YGAlignFlexStart);
const YGNodeRef child = YGNodeNewWithConfig(config);
YGNodeStyleSetMinHeightPercent(child, 40.f);
YGNodeStyleSetMaxHeightPercent(child, 60.f);
YGNodeStyleSetHeight(child, 10.f);
YGNodeStyleSetWidth(child, 50.0f);
YGNodeSetMeasureFunc(child, _measureRecalc);
YGNodeInsertChild(root, child, 0);
YGNodeCalculateLayout(root, 50.0f, YGUndefined, YGDirectionLTR);
ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(child));
YGNodeCalculateLayout(root, 50.0f, 30.0f, YGDirectionLTR);
ASSERT_FLOAT_EQ(12, YGNodeLayoutGetHeight(child));
YGNodeFreeRecursive(root);
}

3
yoga/YGLayout.h
View File

@@ -39,6 +39,9 @@ public:
uint32_t generationCount = 0;
YGDirection lastOwnerDirection = YGDirectionInherit;
bool lastOwnerHadUndefinedHeight = false;
bool lastOwnerHadUndefinedWidth = false;
uint32_t nextCachedMeasurementsIndex = 0;
std::array<YGCachedMeasurement, YG_MAX_CACHED_RESULT_COUNT>
cachedMeasurements = {};

9
yoga/Yoga.cpp
View File

@@ -3867,9 +3867,14 @@ bool YGLayoutNodeInternal(
depth++;
bool ownerHasUndefinedHeight = YGFloatIsUndefined(ownerHeight);
bool ownerHasUndefinedWidth = YGFloatIsUndefined(ownerWidth);
const bool needToVisitNode =
(node->isDirty() && layout->generationCount != generationCount) ||
layout->lastOwnerDirection != ownerDirection;
layout->lastOwnerDirection != ownerDirection ||
layout->lastOwnerHadUndefinedHeight != ownerHasUndefinedHeight||
layout->lastOwnerHadUndefinedWidth != ownerHasUndefinedWidth;
if (needToVisitNode) {
// Invalidate the cached results.
@@ -4051,6 +4056,8 @@ bool YGLayoutNodeInternal(
}
layout->lastOwnerDirection = ownerDirection;
layout->lastOwnerHadUndefinedHeight = ownerHasUndefinedHeight;
layout->lastOwnerHadUndefinedWidth = ownerHasUndefinedWidth;
if (cachedResults == nullptr) {
if (layout->nextCachedMeasurementsIndex + 1 >