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

[ASDisplayNode] Simplify / shorten temporary bridged implementation of preferredFrameSize.

Browse Source
This commit is contained in:
Scott Goodson
2016-10-21 11:21:21 -07:00
parent 15aa784fe8
commit 3a2ca70676
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
AsyncDisplayKit/ASDisplayNode.mm
View File

@@ -3510,8 +3510,6 @@ ASEnvironmentLayoutExtensibilityForwarding
- (void)setPreferredFrameSize:(CGSize)preferredFrameSize
{
ASDN::MutexLocker l(__instanceLock__);
// Deprecated preferredFrameSize just calls through to set width and height
self.style.preferredSize = preferredFrameSize;
[self invalidateCalculatedLayout];
@@ -3519,14 +3517,9 @@ ASEnvironmentLayoutExtensibilityForwarding
- (CGSize)preferredFrameSize
{
ASDN::MutexLocker l(__instanceLock__);
ASLayoutElementStyle *style = self.style;
if (style.width.unit == ASDimensionUnitPoints && style.height.unit == ASDimensionUnitPoints) {
return CGSizeMake(style.width.value, style.height.value);
}
return CGSizeZero;
ASLayoutSize size = self.style.preferredLayoutSize;
BOOL isPoints = (size.width.unit == ASDimensionUnitPoints && size.height.unit == ASDimensionUnitPoints);
return isPoints ? CGSizeMake(size.width.value, size.height.value) : CGSizeZero;
}
@end