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

added nsobject based ASDisplayTraits class

Browse Source
This commit is contained in:
rcancro
2016-05-04 10:37:06 -07:00
parent 35820e58a0
commit f828d079fa
13 changed files with 198 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
AsyncDisplayKit/ASViewController.mm
View File

@@ -11,6 +11,7 @@
#import "ASDimension.h"
#import "ASDisplayNode+FrameworkPrivate.h"
#import "ASDisplayNode+Beta.h"
#import "ASDisplayTraits.h"
#import "ASEnvironmentInternal.h"
#import "ASRangeControllerUpdateRangeProtocol+Beta.h"
@@ -146,7 +147,9 @@
- (ASEnvironmentDisplayTraits)displayTraitsForTraitCollection:(UITraitCollection *)traitCollection
{
if (self.overrideDisplayTraitsWithTraitCollection) {
return self.overrideDisplayTraitsWithTraitCollection(traitCollection);
ASDisplayTraits *displayTraits = self.overrideDisplayTraitsWithTraitCollection(traitCollection);
displayTraits.isMutable = NO;
return [displayTraits environmentDisplayTraits];
}
ASEnvironmentDisplayTraits displayTraits = ASEnvironmentDisplayTraitsFromUITraitCollection(traitCollection);
@@ -157,7 +160,9 @@
- (ASEnvironmentDisplayTraits)displayTraitsForWindowSize:(CGSize)windowSize
{
if (self.overrideDisplayTraitsWithWindowSize) {
return self.overrideDisplayTraitsWithWindowSize(windowSize);
ASDisplayTraits *displayTraits = self.overrideDisplayTraitsWithWindowSize(windowSize);
displayTraits.isMutable = NO;
return [displayTraits environmentDisplayTraits];
}
return self.node.environmentState.displayTraits;
}