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

Fix crash when view that not used Yoga layout

Browse Source
This commit is contained in:
zhongwuzw
2018-03-02 17:42:27 +08:00
parent 31fc287d35
commit 5c5c5baac4
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
YogaKit/Source/YGLayout.m
View File

@@ -195,6 +195,7 @@ static YGConfigRef globalConfig;
NSAssert([NSThread isMainThread], @"This method must be called on the main thread.");
if (self.isEnabled) {
for (UIView *subview in self.view.subviews) {
if (!subview.isYogaEnabled) { continue; }
YGLayout *const yoga = subview.yoga;
if (yoga.isEnabled && yoga.isIncludedInLayout) {
return NO;
@@ -388,7 +389,7 @@ static void YGAttachNodesFromViewHierachy(UIView *const view)
NSMutableArray<UIView *> *subviewsToInclude = [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
for (UIView *subview in view.subviews) {
if (subview.yoga.isEnabled && subview.yoga.isIncludedInLayout) {
if (subview.isYogaEnabled && subview.yoga.isEnabled && subview.yoga.isIncludedInLayout) {
[subviewsToInclude addObject:subview];
}
}
@@ -463,6 +464,7 @@ static void YGApplyLayoutToViewHierarchy(UIView *view, BOOL preserveOrigin)
if (!yoga.isLeaf) {
for (NSUInteger i=0; i<view.subviews.count; i++) {
if (!view.subviews[i].isYogaEnabled) { continue; }
YGApplyLayoutToViewHierarchy(view.subviews[i], NO);
}
}