ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-24 07:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into update-objc

Browse Source 
Conflicts:
	AsyncDisplayKit/ASDisplayNode+Subclasses.h
This commit is contained in:
Adlai Holler
2015-12-13 10:05:03 -08:00
parent b16a9e294e 0cc229d38d
commit 7079a9cc79
51 changed files with 886 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
AsyncDisplayKit/ASDisplayNodeExtras.mm
View File

@@ -7,8 +7,8 @@
*/
#import "ASDisplayNodeExtras.h"
#import "ASDisplayNodeInternal.h"
#import "ASDisplayNode+FrameworkPrivate.h"
extern ASDisplayNode *ASLayerToDisplayNode(CALayer *layer)
{
@@ -46,6 +46,13 @@ extern void ASDisplayNodePerformBlockOnEveryNode(CALayer *layer, ASDisplayNode *
}
}
extern void ASDisplayNodePerformBlockOnEverySubnode(ASDisplayNode *node, void(^block)(ASDisplayNode *node))
{
for (ASDisplayNode *subnode in node.subnodes) {
ASDisplayNodePerformBlockOnEveryNode(nil, subnode, block);
}
}
id ASDisplayNodeFind(ASDisplayNode *node, BOOL (^block)(ASDisplayNode *node))
{
CALayer *layer = node.layer;