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

addressed some comments

Browse Source
This commit is contained in:
rcancro
2016-05-03 21:55:04 -07:00
parent 8bb4eba080
commit b4a6f87ca6
14 changed files with 59 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
AsyncDisplayKit/ASViewController.mm
View File

@@ -143,18 +143,18 @@
#pragma mark - ASDisplayTraits
- (ASDisplayTraits)displayTraitsForTraitCollection:(UITraitCollection *)traitCollection
- (ASEnvironmentDisplayTraits)displayTraitsForTraitCollection:(UITraitCollection *)traitCollection
{
if (self.overrideDisplayTraitsWithTraitCollection) {
return self.overrideDisplayTraitsWithTraitCollection(traitCollection);
}
ASDisplayTraits displayTraits = ASDisplayTraitsFromUITraitCollection(traitCollection);
ASEnvironmentDisplayTraits displayTraits = ASEnvironmentDisplayTraitsFromUITraitCollection(traitCollection);
displayTraits.displayContext = _displayTraitsContext;
return displayTraits;
}
- (ASDisplayTraits)displayTraitsForWindowSize:(CGSize)windowSize
- (ASEnvironmentDisplayTraits)displayTraitsForWindowSize:(CGSize)windowSize
{
if (self.overrideDisplayTraitsWithWindowSize) {
return self.overrideDisplayTraitsWithWindowSize(windowSize);
@@ -162,12 +162,12 @@
return self.node.environmentState.displayTraits;
}
- (void)progagateNewDisplayTraits:(ASDisplayTraits)displayTraits
- (void)progagateNewDisplayTraits:(ASEnvironmentDisplayTraits)displayTraits
{
ASEnvironmentState environmentState = self.node.environmentState;
ASDisplayTraits oldDisplayTraits = environmentState.displayTraits;
ASEnvironmentDisplayTraits oldDisplayTraits = environmentState.displayTraits;
if (ASDisplayTraitsIsEqualToASDisplayTraits(displayTraits, oldDisplayTraits) == NO) {
if (ASEnvironmentDisplayTraitsIsEqualToASEnvironmentDisplayTraits(displayTraits, oldDisplayTraits) == NO) {
environmentState.displayTraits = displayTraits;
[self.node setEnvironmentState:environmentState];
[self.node setNeedsLayout];
@@ -183,7 +183,7 @@
{
[super traitCollectionDidChange:previousTraitCollection];
ASDisplayTraits displayTraits = [self displayTraitsForTraitCollection:self.traitCollection];
ASEnvironmentDisplayTraits displayTraits = [self displayTraitsForTraitCollection:self.traitCollection];
[self progagateNewDisplayTraits:displayTraits];
}
@@ -191,7 +191,7 @@
{
[super willTransitionToTraitCollection:newCollection withTransitionCoordinator:coordinator];
ASDisplayTraits displayTraits = [self displayTraitsForTraitCollection:self.traitCollection];
ASEnvironmentDisplayTraits displayTraits = [self displayTraitsForTraitCollection:self.traitCollection];
[self progagateNewDisplayTraits:displayTraits];
}
@@ -199,7 +199,7 @@
{
[super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
ASDisplayTraits displayTraits = [self displayTraitsForWindowSize:size];
ASEnvironmentDisplayTraits displayTraits = [self displayTraitsForWindowSize:size];
[self progagateNewDisplayTraits:displayTraits];
}