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

Moved ASLayoutable* properties into ASLayoutOptions class

Browse Source
This commit is contained in:
rcancro
2015-08-28 09:36:22 -07:00
parent 61b72d2c46
commit 15b3fd6eab
25 changed files with 370 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
AsyncDisplayKit/Layout/ASStaticLayoutSpec.mm
View File

@@ -36,17 +36,6 @@
return self;
}
- (void)setChildren:(NSArray *)children
{
[super setChildren:children];
#if DEBUG
for (id<ASStaticLayoutable> child in children) {
ASDisplayNodeAssert(([child finalLayoutable] == child && [child conformsToProtocol:@protocol(ASStaticLayoutable)]) || ([child finalLayoutable] != child && [[child finalLayoutable] conformsToProtocol:@protocol(ASStaticLayoutable)]), @"child must conform to ASStaticLayoutable");
}
#endif
}
- (ASLayout *)measureWithSizeRange:(ASSizeRange)constrainedSize
{
CGSize size = {
@@ -55,16 +44,17 @@
};
NSMutableArray *sublayouts = [NSMutableArray arrayWithCapacity:self.children.count];
for (id<ASStaticLayoutable> child in self.children) {
for (id<ASLayoutable> child in self.children) {
ASLayoutOptions *layoutOptions = [ASLayoutSpec layoutOptionsForChild:child];
CGSize autoMaxSize = {
constrainedSize.max.width - child.position.x,
constrainedSize.max.height - child.position.y
constrainedSize.max.width - layoutOptions.position.x,
constrainedSize.max.height - layoutOptions.position.y
};
ASSizeRange childConstraint = ASRelativeSizeRangeEqualToRelativeSizeRange(ASRelativeSizeRangeUnconstrained, child.sizeRange)
ASSizeRange childConstraint = ASRelativeSizeRangeEqualToRelativeSizeRange(ASRelativeSizeRangeUnconstrained, layoutOptions.sizeRange)
? ASSizeRangeMake({0, 0}, autoMaxSize)
: ASRelativeSizeRangeResolve(child.sizeRange, size);
: ASRelativeSizeRangeResolve(layoutOptions.sizeRange, size);
ASLayout *sublayout = [child measureWithSizeRange:childConstraint];
sublayout.position = child.position;
sublayout.position = layoutOptions.position;
[sublayouts addObject:sublayout];
}