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

rename containerWindowSize to containerSize

Browse Source
This commit is contained in:
ricky
2016-07-07 10:55:18 -07:00
parent 3512cf47aa
commit 7314a18ab4
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AsyncDisplayKit/ASViewController.mm
View File

@@ -197,7 +197,7 @@ ASVisibilityDepthImplementation;
ASDisplayNodeAssertMainThread(); ASDisplayNodeAssertMainThread();
ASEnvironmentTraitCollection asyncTraitCollection = ASEnvironmentTraitCollectionFromUITraitCollection(traitCollection); ASEnvironmentTraitCollection asyncTraitCollection = ASEnvironmentTraitCollectionFromUITraitCollection(traitCollection);
asyncTraitCollection.containerWindowSize = self.view.frame.size; asyncTraitCollection.containerSize = self.view.frame.size;
return asyncTraitCollection; return asyncTraitCollection;
} }
@@ -207,7 +207,7 @@ ASVisibilityDepthImplementation;
ASTraitCollection *traitCollection = self.overrideDisplayTraitsWithWindowSize(windowSize); ASTraitCollection *traitCollection = self.overrideDisplayTraitsWithWindowSize(windowSize);
return [traitCollection environmentTraitCollection]; return [traitCollection environmentTraitCollection];
} }
self.node.environmentTraitCollection.containerWindowSize = windowSize; self.node.environmentTraitCollection.containerSize = windowSize;
return self.node.environmentTraitCollection; return self.node.environmentTraitCollection;
} }
@@ -233,7 +233,7 @@ ASVisibilityDepthImplementation;
[super traitCollectionDidChange:previousTraitCollection]; [super traitCollectionDidChange:previousTraitCollection];
ASEnvironmentTraitCollection environmentTraitCollection = [self environmentTraitCollectionForUITraitCollection:self.traitCollection]; ASEnvironmentTraitCollection environmentTraitCollection = [self environmentTraitCollectionForUITraitCollection:self.traitCollection];
environmentTraitCollection.containerWindowSize = self.view.bounds.size; environmentTraitCollection.containerSize = self.view.bounds.size;
[self progagateNewEnvironmentTraitCollection:environmentTraitCollection]; [self progagateNewEnvironmentTraitCollection:environmentTraitCollection];
} }

2
AsyncDisplayKit/Details/ASEnvironment.h
View File

@@ -70,7 +70,7 @@ typedef struct ASEnvironmentTraitCollection {
UIUserInterfaceSizeClass verticalSizeClass; UIUserInterfaceSizeClass verticalSizeClass;
UIForceTouchCapability forceTouchCapability; UIForceTouchCapability forceTouchCapability;
CGSize containerWindowSize; CGSize containerSize;
} ASEnvironmentTraitCollection; } ASEnvironmentTraitCollection;
extern ASEnvironmentTraitCollection ASEnvironmentTraitCollectionFromUITraitCollection(UITraitCollection *traitCollection); extern ASEnvironmentTraitCollection ASEnvironmentTraitCollectionFromUITraitCollection(UITraitCollection *traitCollection);

4
AsyncDisplayKit/Details/ASEnvironment.mm
View File

@@ -30,7 +30,7 @@ ASEnvironmentTraitCollection _ASEnvironmentTraitCollectionMakeDefault()
{ {
return (ASEnvironmentTraitCollection) { return (ASEnvironmentTraitCollection) {
// Default values can be defined in here // Default values can be defined in here
.containerWindowSize = CGSizeZero, .containerSize = CGSizeZero,
}; };
} }
@@ -57,7 +57,7 @@ BOOL ASEnvironmentTraitCollectionIsEqualToASEnvironmentTraitCollection(ASEnviron
lhs.displayScale == rhs.displayScale && lhs.displayScale == rhs.displayScale &&
lhs.userInterfaceIdiom == rhs.userInterfaceIdiom && lhs.userInterfaceIdiom == rhs.userInterfaceIdiom &&
lhs.forceTouchCapability == rhs.forceTouchCapability && lhs.forceTouchCapability == rhs.forceTouchCapability &&
CGSizeEqualToSize(lhs.containerWindowSize, rhs.containerWindowSize); CGSizeEqualToSize(lhs.containerSize, rhs.containerSize);
} }
ASEnvironmentState ASEnvironmentStateMakeDefault() ASEnvironmentState ASEnvironmentStateMakeDefault()

6
AsyncDisplayKit/Details/ASTraitCollection.h
View File

@@ -18,13 +18,13 @@
@property (nonatomic, assign, readonly) UIUserInterfaceIdiom userInterfaceIdiom; @property (nonatomic, assign, readonly) UIUserInterfaceIdiom userInterfaceIdiom;
@property (nonatomic, assign, readonly) UIUserInterfaceSizeClass verticalSizeClass; @property (nonatomic, assign, readonly) UIUserInterfaceSizeClass verticalSizeClass;
@property (nonatomic, assign, readonly) UIForceTouchCapability forceTouchCapability; @property (nonatomic, assign, readonly) UIForceTouchCapability forceTouchCapability;
@property (nonatomic, assign, readonly) CGSize containerWindowSize; @property (nonatomic, assign, readonly) CGSize containerSize;
+ (ASTraitCollection *)traitCollectionWithASEnvironmentTraitCollection:(ASEnvironmentTraitCollection)traits; + (ASTraitCollection *)traitCollectionWithASEnvironmentTraitCollection:(ASEnvironmentTraitCollection)traits;
+ (ASTraitCollection *)traitCollectionWithUITraitCollection:(UITraitCollection *)traitCollection + (ASTraitCollection *)traitCollectionWithUITraitCollection:(UITraitCollection *)traitCollection
containerWindowSize:(CGSize)windowSize; containerSize:(CGSize)windowSize;
+ (ASTraitCollection *)traitCollectionWithDisplayScale:(CGFloat)displayScale + (ASTraitCollection *)traitCollectionWithDisplayScale:(CGFloat)displayScale
@@ -32,7 +32,7 @@
horizontalSizeClass:(UIUserInterfaceSizeClass)horizontalSizeClass horizontalSizeClass:(UIUserInterfaceSizeClass)horizontalSizeClass
verticalSizeClass:(UIUserInterfaceSizeClass)verticalSizeClass verticalSizeClass:(UIUserInterfaceSizeClass)verticalSizeClass
forceTouchCapability:(UIForceTouchCapability)forceTouchCapability forceTouchCapability:(UIForceTouchCapability)forceTouchCapability
containerWindowSize:(CGSize)windowSize; containerSize:(CGSize)windowSize;
- (ASEnvironmentTraitCollection)environmentTraitCollection; - (ASEnvironmentTraitCollection)environmentTraitCollection;

20
AsyncDisplayKit/Details/ASTraitCollection.m
View File

@@ -21,7 +21,7 @@
horizontalSizeClass:(UIUserInterfaceSizeClass)horizontalSizeClass horizontalSizeClass:(UIUserInterfaceSizeClass)horizontalSizeClass
verticalSizeClass:(UIUserInterfaceSizeClass)verticalSizeClass verticalSizeClass:(UIUserInterfaceSizeClass)verticalSizeClass
forceTouchCapability:(UIForceTouchCapability)forceTouchCapability forceTouchCapability:(UIForceTouchCapability)forceTouchCapability
containerWindowSize:(CGSize)windowSize containerSize:(CGSize)windowSize
{ {
self = [super init]; self = [super init];
if (self) { if (self) {
@@ -30,7 +30,7 @@
_horizontalSizeClass = horizontalSizeClass; _horizontalSizeClass = horizontalSizeClass;
_verticalSizeClass = verticalSizeClass; _verticalSizeClass = verticalSizeClass;
_forceTouchCapability = forceTouchCapability; _forceTouchCapability = forceTouchCapability;
_containerWindowSize = windowSize; _containerSize = windowSize;
} }
return self; return self;
} }
@@ -40,14 +40,14 @@
horizontalSizeClass:(UIUserInterfaceSizeClass)horizontalSizeClass horizontalSizeClass:(UIUserInterfaceSizeClass)horizontalSizeClass
verticalSizeClass:(UIUserInterfaceSizeClass)verticalSizeClass verticalSizeClass:(UIUserInterfaceSizeClass)verticalSizeClass
forceTouchCapability:(UIForceTouchCapability)forceTouchCapability forceTouchCapability:(UIForceTouchCapability)forceTouchCapability
containerWindowSize:(CGSize)windowSize containerSize:(CGSize)windowSize
{ {
return [[[self class] alloc] initWithDisplayScale:displayScale return [[[self class] alloc] initWithDisplayScale:displayScale
userInterfaceIdiom:userInterfaceIdiom userInterfaceIdiom:userInterfaceIdiom
horizontalSizeClass:horizontalSizeClass horizontalSizeClass:horizontalSizeClass
verticalSizeClass:verticalSizeClass verticalSizeClass:verticalSizeClass
forceTouchCapability:forceTouchCapability forceTouchCapability:forceTouchCapability
containerWindowSize:windowSize]; containerSize:windowSize];
} }
+ (ASTraitCollection *)traitCollectionWithASEnvironmentTraitCollection:(ASEnvironmentTraitCollection)traits + (ASTraitCollection *)traitCollectionWithASEnvironmentTraitCollection:(ASEnvironmentTraitCollection)traits
@@ -57,12 +57,12 @@
horizontalSizeClass:traits.horizontalSizeClass horizontalSizeClass:traits.horizontalSizeClass
verticalSizeClass:traits.verticalSizeClass verticalSizeClass:traits.verticalSizeClass
forceTouchCapability:traits.forceTouchCapability forceTouchCapability:traits.forceTouchCapability
containerWindowSize:traits.containerWindowSize]; containerSize:traits.containerSize];
} }
+ (ASTraitCollection *)traitCollectionWithUITraitCollection:(UITraitCollection *)traitCollection + (ASTraitCollection *)traitCollectionWithUITraitCollection:(UITraitCollection *)traitCollection
containerWindowSize:(CGSize)windowSize containerSize:(CGSize)windowSize
{ {
ASTraitCollection *asyncTraitCollection = nil; ASTraitCollection *asyncTraitCollection = nil;
if (AS_AT_LEAST_IOS9) { if (AS_AT_LEAST_IOS9) {
@@ -71,7 +71,7 @@
horizontalSizeClass:traitCollection.horizontalSizeClass horizontalSizeClass:traitCollection.horizontalSizeClass
verticalSizeClass:traitCollection.verticalSizeClass verticalSizeClass:traitCollection.verticalSizeClass
forceTouchCapability:traitCollection.forceTouchCapability forceTouchCapability:traitCollection.forceTouchCapability
containerWindowSize:windowSize]; containerSize:windowSize];
} }
else if (AS_AT_LEAST_IOS8) { else if (AS_AT_LEAST_IOS8) {
asyncTraitCollection = [[[self class] alloc] initWithDisplayScale:traitCollection.displayScale asyncTraitCollection = [[[self class] alloc] initWithDisplayScale:traitCollection.displayScale
@@ -79,7 +79,7 @@
horizontalSizeClass:traitCollection.horizontalSizeClass horizontalSizeClass:traitCollection.horizontalSizeClass
verticalSizeClass:traitCollection.verticalSizeClass verticalSizeClass:traitCollection.verticalSizeClass
forceTouchCapability:0 forceTouchCapability:0
containerWindowSize:windowSize]; containerSize:windowSize];
} else { } else {
asyncTraitCollection = [[[self class] alloc] init]; asyncTraitCollection = [[[self class] alloc] init];
} }
@@ -95,7 +95,7 @@
.userInterfaceIdiom = self.userInterfaceIdiom, .userInterfaceIdiom = self.userInterfaceIdiom,
.verticalSizeClass = self.verticalSizeClass, .verticalSizeClass = self.verticalSizeClass,
.forceTouchCapability = self.forceTouchCapability, .forceTouchCapability = self.forceTouchCapability,
.containerWindowSize = self.containerWindowSize, .containerSize = self.containerSize,
}; };
} }
@@ -105,7 +105,7 @@
self.horizontalSizeClass == traitCollection.horizontalSizeClass && self.horizontalSizeClass == traitCollection.horizontalSizeClass &&
self.verticalSizeClass == traitCollection.verticalSizeClass && self.verticalSizeClass == traitCollection.verticalSizeClass &&
self.userInterfaceIdiom == traitCollection.userInterfaceIdiom && self.userInterfaceIdiom == traitCollection.userInterfaceIdiom &&
CGSizeEqualToSize(self.containerWindowSize, traitCollection.containerWindowSize) && CGSizeEqualToSize(self.containerSize, traitCollection.containerSize) &&
self.forceTouchCapability == traitCollection.forceTouchCapability; self.forceTouchCapability == traitCollection.forceTouchCapability;
} }

2
AsyncDisplayKit/Private/ASEnvironmentInternal.mm
View File

@@ -207,7 +207,7 @@ ASEnvironmentState ASEnvironmentMergeObjectAndState(ASEnvironmentState childEnvi
childTraitCollection.userInterfaceIdiom = parentTraitCollection.userInterfaceIdiom; childTraitCollection.userInterfaceIdiom = parentTraitCollection.userInterfaceIdiom;
childTraitCollection.forceTouchCapability = parentTraitCollection.forceTouchCapability; childTraitCollection.forceTouchCapability = parentTraitCollection.forceTouchCapability;
childTraitCollection.displayScale = parentTraitCollection.displayScale; childTraitCollection.displayScale = parentTraitCollection.displayScale;
childTraitCollection.containerWindowSize = parentTraitCollection.containerWindowSize; childTraitCollection.containerSize = parentTraitCollection.containerSize;
childEnvironmentState.environmentTraitCollection = childTraitCollection; childEnvironmentState.environmentTraitCollection = childTraitCollection;
} }