ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-16 19:30:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove styleClass property from ASLayoutable for now (#2279)

Browse Source
This commit is contained in:
Michael Schneider 2016-09-23 09:30:17 -07:00 committed by GitHub
parent 75dca556e6
commit 9f55de2c6c
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
AsyncDisplayKit/ASDisplayNode.mm
View File

@ -300,7 +300,7 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
_contentsScaleForDisplay = ASScreenScale(); _contentsScaleForDisplay = ASScreenScale();
_displaySentinel = [[ASSentinel alloc] init]; _displaySentinel = [[ASSentinel alloc] init];
_style = [[[[self class] styleClass] alloc] init]; _style = [[ASLayoutableStyle alloc] init];
_preferredFrameSize = CGSizeZero; _preferredFrameSize = CGSizeZero;
_environmentState = ASEnvironmentStateMakeDefault(); _environmentState = ASEnvironmentStateMakeDefault();
@ -723,11 +723,6 @@ static ASDisplayNodeMethodOverrides GetASDisplayNodeMethodOverrides(Class c)
#pragma mark - Style #pragma mark - Style
+ (Class)styleClass
{
return [ASLayoutableStyle class];
}
- (ASLayoutableStyle *)style - (ASLayoutableStyle *)style
{ {
ASDN::MutexLocker l(__instanceLock__); ASDN::MutexLocker l(__instanceLock__);

7
AsyncDisplayKit/Layout/ASLayoutSpec.mm
View File

@ -59,7 +59,7 @@ typedef std::map<unsigned long, id<ASLayoutable>, std::less<unsigned long>> ASCh
_isMutable = YES; _isMutable = YES;
_environmentState = ASEnvironmentStateMakeDefault(); _environmentState = ASEnvironmentStateMakeDefault();
_style = [[[[self class] styleClass] alloc] init]; _style = [[ASLayoutableStyle alloc] init];
return self; return self;
} }
@ -76,11 +76,6 @@ typedef std::map<unsigned long, id<ASLayoutable>, std::less<unsigned long>> ASCh
#pragma mark - Style #pragma mark - Style
+ (Class)styleClass
{
return [ASLayoutableStyle class];
}
- (ASLayoutableStyle *)style - (ASLayoutableStyle *)style
{ {
ASDN::MutexLocker l(__instanceLock__); ASDN::MutexLocker l(__instanceLock__);

10
AsyncDisplayKit/Layout/ASLayoutable.h
View File

@ -69,16 +69,6 @@ NS_ASSUME_NONNULL_BEGIN
*/ */
@property (nonatomic, assign, readonly) ASLayoutableStyle *style; @property (nonatomic, assign, readonly) ASLayoutableStyle *style;
/**
* @discussion This property contains the ASLayoutableStyle class object by default. Subclasses can use this property to
* return a different size class as needed. For example, if your layoutable would like extend the style object to support
* more properties you might want to set this property to a custom subclass of ASLayoutableStyle.
*
* This property is set only once early in the creation of the layoutable to create the corresponding style object.
*/
@property (class, nonatomic, readonly) Class styleClass;
#pragma mark - Calculate layout #pragma mark - Calculate layout
/** /**