ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-17 11:50:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ASEnvironment] Fix incomplete gating of upward propagation of layout properties (disabled for now).

Browse Source
This commit is contained in:
Scott Goodson 2016-04-11 20:34:24 -07:00
parent 1b7b1f3991
commit 8ccef1e99f
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsyncDisplayKit/ASDisplayNode.mm
View File

@ -2695,7 +2695,7 @@ static const char *ASDisplayNodeDrawingPriorityKey = "ASDrawingPriority";
- (BOOL)supportsUpwardPropagation - (BOOL)supportsUpwardPropagation
{ {
return YES; return ASEnvironmentStatePropagationEnabled();
} }
ASEnvironmentLayoutOptionsForwarding ASEnvironmentLayoutOptionsForwarding

2
AsyncDisplayKit/Layout/ASLayoutSpec.mm
View File

@ -175,7 +175,7 @@ static NSString * const kDefaultChildrenKey = @"kDefaultChildrenKey";
// the specifications that are known to have more than one. // the specifications that are known to have more than one.
- (BOOL)supportsUpwardPropagation - (BOOL)supportsUpwardPropagation
{ {
return YES; return ASEnvironmentStatePropagationEnabled();
} }
ASEnvironmentLayoutOptionsForwarding ASEnvironmentLayoutOptionsForwarding

3
AsyncDisplayKit/Layout/ASLayoutablePrivate.h
View File

@ -79,6 +79,9 @@ extern void ASLayoutableClearCurrentContext();
#define ASEnvironmentLayoutOptionsForwarding \ #define ASEnvironmentLayoutOptionsForwarding \
- (void)propagateUpLayoutOptionsState\ - (void)propagateUpLayoutOptionsState\
{\ {\
if (!ASEnvironmentStatePropagationEnabled()) {\
return;\
}\
id<ASEnvironment> parent = [self parent];\ id<ASEnvironment> parent = [self parent];\
if ([parent supportsUpwardPropagation]) {\ if ([parent supportsUpwardPropagation]) {\
ASEnvironmentStatePropagateUp(parent, _environmentState.layoutOptionsState);\ ASEnvironmentStatePropagateUp(parent, _environmentState.layoutOptionsState);\