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' of https://github.com/Xinchi/AsyncDisplayKit

Browse Source
This commit is contained in:
Max Gu
2016-02-19 12:52:03 -08:00
parent 03446d97e1 75eab1db07
commit 650b500f92
3 changed files with 1 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AsyncDisplayKit/ASCellNode.h
View File

@@ -16,7 +16,6 @@ typedef NSUInteger ASCellNodeAnimation;
@protocol ASCellNodeLayoutDelegate <NSObject>
- (void)scrollViewDidScroll:(UIScrollView *)scrollView cellFrameInScrollView:(CGRect)cellFrame;
/**
* Notifies the delegate that the specified cell node has done a relayout.
* The notification is done on main thread.
@@ -26,8 +25,6 @@ typedef NSUInteger ASCellNodeAnimation;
*/
- (void)nodeDidRelayout:(ASCellNode *)node sizeChanged:(BOOL)sizeChanged;
<<<<<<< HEAD
=======
@optional
/**
* Notifies the delegate that the specified cell node has scrolled
@@ -36,7 +33,6 @@ typedef NSUInteger ASCellNodeAnimation;
* @param cellFrame: The frame of the cell that has just scrolled
*/
- (void)visibleNodeDidScroll:(ASCellNode *)node inScrollView:(UIScrollView *)scrollView withCellFrame:(CGRect)cellFrame;
>>>>>>> 4b8216f... Adding scroll visibility
@end
@@ -122,12 +118,8 @@ typedef NSUInteger ASCellNodeAnimation;
*/
- (instancetype)initWithViewControllerBlock:(ASDisplayNodeViewControllerBlock)viewControllerBlock didLoadBlock:(ASDisplayNodeDidLoadBlock)didLoadBlock;
<<<<<<< HEAD
- (void)updateScrollSituationWithScrollVIew:(UIScrollView *)scrollView;
=======
- (void)_visibleNodeDidScroll:(UIScrollView *)scrollView withCellFrame:(CGRect)cellFrame;
>>>>>>> 4b8216f... Adding scroll visibility
@end