ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 06:35:51 +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-06 12:25:13 -08:00
parent 73b90023dc 29897297c5
commit b16a9e294e
10 changed files with 193 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AsyncDisplayKit/ASCellNode.h
View File

@@ -21,8 +21,9 @@ typedef NSUInteger ASCellNodeAnimation;
* The notification is done on main thread.
*
* @param node A node informing the delegate about the relayout.
* @param sizeChanged `YES` if the node's `calculatedSize` changed during the relayout, `NO` otherwise.
*/
- (void)nodeDidRelayout:(ASCellNode *)node;
- (void)nodeDidRelayout:(ASCellNode *)node sizeChanged:(BOOL)sizeChanged;
@end
/**