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

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

8
AsyncDisplayKit/Private/ASStackPositionedLayout.mm
View File

@@ -19,7 +19,8 @@ static CGFloat crossOffset(const ASStackLayoutSpecStyle &style,
const ASStackUnpositionedItem &l,
const CGFloat crossSize)
{
switch (alignment(l.child.alignSelf, style.alignItems)) {
ASLayoutOptions *layoutOptions = [ASLayoutSpec layoutOptionsForChild:l.child];
switch (alignment(layoutOptions.alignSelf, style.alignItems)) {
case ASStackLayoutAlignItemsEnd:
return crossSize - crossDimension(style.direction, l.layout.size);
case ASStackLayoutAlignItemsCenter:
@@ -48,14 +49,15 @@ static ASStackPositionedLayout stackedLayout(const ASStackLayoutSpecStyle &style
CGPoint p = directionPoint(style.direction, offset, 0);
BOOL first = YES;
auto stackedChildren = AS::map(unpositionedLayout.items, [&](const ASStackUnpositionedItem &l) -> ASLayout *{
p = p + directionPoint(style.direction, l.child.spacingBefore, 0);
ASLayoutOptions *layoutOptions = [ASLayoutSpec layoutOptionsForChild:l.child];
p = p + directionPoint(style.direction, layoutOptions.spacingBefore, 0);
if (!first) {
p = p + directionPoint(style.direction, style.spacing, 0);
}
first = NO;
l.layout.position = p + directionPoint(style.direction, 0, crossOffset(style, l, crossSize));
p = p + directionPoint(style.direction, stackDimension(style.direction, l.layout.size) + l.child.spacingAfter, 0);
p = p + directionPoint(style.direction, stackDimension(style.direction, l.layout.size) + layoutOptions.spacingAfter, 0);
return l.layout;
});
return {stackedChildren, crossSize};