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-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

6
AsyncDisplayKit/ASCellNode.m
View File

@@ -53,11 +53,13 @@
- (void)setNeedsLayout
{
ASDisplayNodeAssertThreadAffinity(self);
CGSize oldSize = self.calculatedSize;
[super setNeedsLayout];
if (_layoutDelegate != nil) {
BOOL sizeChanged = !CGSizeEqualToSize(oldSize, self.calculatedSize);
ASPerformBlockOnMainThread(^{
[_layoutDelegate nodeDidRelayout:self];
[_layoutDelegate nodeDidRelayout:self sizeChanged:sizeChanged];
});
}
}