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

【YogaKit】Fix two crashes. YogaKitSample upgrade to swift 5 #1144

Closed
Henrs wants to merge 3 commits from main into main
pull from: main
merge into: DaddyFrosty:main
Conversation 5 Commits 3 Files Changed 3 +36 -32
3 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9d6eaa473d - Show all commits

8
YogaKit/Source/YGLayout.m
View File

@@ -430,7 +430,13 @@ static void YGAttachNodesFromViewHierachy(UIView* const view) {
if (!YGNodeHasExactSameChildren(node, subviewsToInclude)) { if (!YGNodeHasExactSameChildren(node, subviewsToInclude)) {
YGRemoveAllChildren(node); YGRemoveAllChildren(node);
for (int i = 0; i < subviewsToInclude.count; i++) { for (int i = 0; i < subviewsToInclude.count; i++) {
YGNodeInsertChild(node, subviewsToInclude[i].yoga.node, i); // should remove from owner if node has one owner
const YGNodeRef child = subviewsToInclude[i].yoga.node;
YGNodeRef owner = YGNodeGetOwner(child);
if (owner) {
YGNodeRemoveChild(owner, child);
}
YGNodeInsertChild(node, child, i);
} }
} }