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

addressed comments and fixed tests

Browse Source
This commit is contained in:
rcancro
2015-08-21 21:03:40 -07:00
parent c06a6be188
commit 680305704a
17 changed files with 82 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
AsyncDisplayKit/Layout/ASStackLayoutSpec.mm
View File

@@ -28,43 +28,27 @@
- (instancetype)init
{
return [self initWithDirection:ASStackLayoutDirectionHorizontal
spacing:0.0
contentJustification:ASStackLayoutJustifyContentStart
itemAlignment:ASStackLayoutAlignItemsStart
children:nil];
return [self initWithDirection:ASStackLayoutDirectionHorizontal spacing:0.0 justifyContent:ASStackLayoutJustifyContentStart alignItems:ASStackLayoutAlignItemsStart children:nil];
}
+ (instancetype)satckLayoutSpecWithDirection:(ASStackLayoutDirection)direction
spacing:(CGFloat)spacing
contentJustification:(ASStackLayoutJustifyContent)justifyContent
itemAlignment:(ASStackLayoutAlignItems)alignItems
children:(NSArray *)children
+ (instancetype)stackLayoutSpecWithDirection:(ASStackLayoutDirection)direction spacing:(CGFloat)spacing justifyContent:(ASStackLayoutJustifyContent)justifyContent alignItems:(ASStackLayoutAlignItems)alignItems children:(NSArray *)children
{
return [[self alloc] initWithDirection:direction
spacing:spacing
contentJustification:justifyContent
itemAlignment:alignItems
children:children];
return [[self alloc] initWithDirection:direction spacing:spacing justifyContent:justifyContent alignItems:alignItems children:children];
}
- (instancetype)initWithDirection:(ASStackLayoutDirection)direction
spacing:(CGFloat)spacing
contentJustification:(ASStackLayoutJustifyContent)justifyContent
itemAlignment:(ASStackLayoutAlignItems)alignItems
children:(NSArray *)children;
- (instancetype)initWithDirection:(ASStackLayoutDirection)direction spacing:(CGFloat)spacing justifyContent:(ASStackLayoutJustifyContent)justifyContent alignItems:(ASStackLayoutAlignItems)alignItems children:(NSArray *)children
{
self = [super init];
if (self) {
_direction = direction;
_alignItems = alignItems;
_spacing = spacing;
_justifyContent = justifyContent;
_children = std::vector<id<ASLayoutable>>();
for (id<ASLayoutable> child in children) {
_children.push_back(child);
}
if (!(self = [super init])) {
return nil;
}
_direction = direction;
_alignItems = alignItems;
_spacing = spacing;
_justifyContent = justifyContent;
_children = std::vector<id<ASLayoutable>>();
for (id<ASLayoutable> child in children) {
_children.push_back(child);
}
return self;
}
@@ -82,7 +66,6 @@
}
}
- (void)setDirection:(ASStackLayoutDirection)direction
{
ASDisplayNodeAssert(self.isMutable, @"Cannot set properties when layout spec is not mutable");
@@ -109,11 +92,7 @@
- (ASLayout *)measureWithSizeRange:(ASSizeRange)constrainedSize
{
ASStackLayoutSpecStyle style = {.direction = _direction,
.spacing = _spacing,
.justifyContent = _justifyContent,
.alignItems = _alignItems
};
ASStackLayoutSpecStyle style = {.direction = _direction, .spacing = _spacing, .justifyContent = _justifyContent, .alignItems = _alignItems};
const auto unpositionedLayout = ASStackUnpositionedLayout::compute(_children, style, constrainedSize);
const auto positionedLayout = ASStackPositionedLayout::compute(unpositionedLayout, style, constrainedSize);
const CGSize finalSize = directionSize(style.direction, unpositionedLayout.stackDimensionSum, positionedLayout.crossSize);