ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-14 02:10:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that .hierarchyState is propogated to new subnodes early enough for us to reference it as the views are added.

Browse Source
This commit is contained in:
Scott Goodson 2015-12-18 19:52:47 -08:00
parent 834cf79c4e
commit 32a99e3d41
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
AsyncDisplayKit/ASDisplayNode.mm
View File

@ -951,6 +951,10 @@ static bool disableNotificationsForMovingBetweenParents(ASDisplayNode *from, ASD
[_subnodes addObject:subnode]; [_subnodes addObject:subnode];
// This call will apply our .hierarchyState to the new subnode.
// If we are a managed hierarchy, as in ASCellNode trees, it will also apply our .interfaceState.
[subnode __setSupernode:self];
if (self.nodeLoaded) { if (self.nodeLoaded) {
// If this node has a view or layer, force the subnode to also create its view or layer and add it to the hierarchy here. // If this node has a view or layer, force the subnode to also create its view or layer and add it to the hierarchy here.
// Otherwise there is no way for the subnode's view or layer to enter the hierarchy, except recursing down all // Otherwise there is no way for the subnode's view or layer to enter the hierarchy, except recursing down all
@ -969,8 +973,6 @@ static bool disableNotificationsForMovingBetweenParents(ASDisplayNode *from, ASD
if (isMovingEquivalentParents) { if (isMovingEquivalentParents) {
[subnode __decrementVisibilityNotificationsDisabled]; [subnode __decrementVisibilityNotificationsDisabled];
} }
[subnode __setSupernode:self];
} }
/* /*
@ -1267,7 +1269,7 @@ static NSInteger incrementIfFound(NSInteger i) {
} }
// This uses the layer hieararchy for safety. Who knows what people might do and it would be bad to have visibilty out of sync // This uses the layer hieararchy for safety. Who knows what people might do and it would be bad to have visibilty out of sync
- (BOOL)__hasParentWithVisibilityNotificationsDisabled - (BOOL)__selfOrParentHasVisibilityNotificationsDisabled
{ {
CALayer *layer = _layer; CALayer *layer = _layer;
do { do {
@ -1287,7 +1289,7 @@ static NSInteger incrementIfFound(NSInteger i) {
{ {
ASDisplayNodeAssertMainThread(); ASDisplayNodeAssertMainThread();
ASDisplayNodeAssert(!_flags.isEnteringHierarchy, @"Should not cause recursive __enterHierarchy"); ASDisplayNodeAssert(!_flags.isEnteringHierarchy, @"Should not cause recursive __enterHierarchy");
if (!self.inHierarchy && !_flags.visibilityNotificationsDisabled && ![self __hasParentWithVisibilityNotificationsDisabled]) { if (!self.inHierarchy && !_flags.visibilityNotificationsDisabled && ![self __selfOrParentHasVisibilityNotificationsDisabled]) {
self.inHierarchy = YES; self.inHierarchy = YES;
_flags.isEnteringHierarchy = YES; _flags.isEnteringHierarchy = YES;
if (self.shouldRasterizeDescendants) { if (self.shouldRasterizeDescendants) {
@ -1309,7 +1311,7 @@ static NSInteger incrementIfFound(NSInteger i) {
{ {
ASDisplayNodeAssertMainThread(); ASDisplayNodeAssertMainThread();
ASDisplayNodeAssert(!_flags.isExitingHierarchy, @"Should not cause recursive __exitHierarchy"); ASDisplayNodeAssert(!_flags.isExitingHierarchy, @"Should not cause recursive __exitHierarchy");
if (self.inHierarchy && !_flags.visibilityNotificationsDisabled && ![self __hasParentWithVisibilityNotificationsDisabled]) { if (self.inHierarchy && !_flags.visibilityNotificationsDisabled && ![self __selfOrParentHasVisibilityNotificationsDisabled]) {
self.inHierarchy = NO; self.inHierarchy = NO;
[self.asyncLayer cancelAsyncDisplay]; [self.asyncLayer cancelAsyncDisplay];
@ -1807,6 +1809,19 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock)
_hierarchyState = newState; _hierarchyState = newState;
} }
// Entered or exited contents rendering state.
if ((newState & ASHierarchyStateRangeManaged) != (oldState & ASHierarchyStateRangeManaged)) {
if (newState & ASHierarchyStateRangeManaged) {
[self enterInterfaceState:self.supernode.interfaceState];
} else {
// The case of exiting a range-managed state should be fairly rare. Adding or removing the node
// to a view hierarchy will cause its interfaceState to be either fully set or unset (all fields),
// but because we might be about to be added to a view hierarchy, exiting the interface state now
// would cause inefficient churn. The tradeoff is that we may not clear contents / fetched data
// for nodes that are removed from a managed state and then retained but not used (bad idea anyway!)
}
}
if (newState != oldState) { if (newState != oldState) {
LOG(@"setHierarchyState: oldState = %lu, newState = %lu", (unsigned long)oldState, (unsigned long)newState); LOG(@"setHierarchyState: oldState = %lu, newState = %lu", (unsigned long)oldState, (unsigned long)newState);
} }