ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-07 13:35:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

flailing

Browse Source
This commit is contained in:
ricky cancro
2015-08-19 16:59:23 -07:00
committed by rcancro
parent 3fd241e87e
commit ef89f758bc
16 changed files with 172 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
AsyncDisplayKit/Private/ASStackPositionedLayout.mm
View File

@@ -18,10 +18,8 @@
static CGFloat baselineForItem(const ASStackLayoutSpecStyle &style,
const ASStackUnpositionedItem &item) {
const ASStackLayoutAlignItems alignItems = alignment(item.child.alignSelf, style.alignItems);
if (alignItems == ASStackLayoutAlignItemsBaselineFirst) {
return item.child.ascender;
} else if (alignItems == ASStackLayoutAlignItemsBaselineLast) {
return item.layout.size.height + item.child.descender;
if (alignItems == ASStackLayoutAlignItemsFirstBaseline || alignItems == ASStackLayoutAlignItemsLastBaseline) {
return [item.child distanceToBaseline:alignItems];
}
return 0;
}
@@ -39,9 +37,8 @@ static CGFloat crossOffset(const ASStackLayoutSpecStyle &style,
case ASStackLayoutAlignItemsStart:
case ASStackLayoutAlignItemsStretch:
return 0;
case ASStackLayoutAlignItemsBaselineFirst:
return maxBaseline - l.child.ascender;
case ASStackLayoutAlignItemsBaselineLast:
case ASStackLayoutAlignItemsLastBaseline:
case ASStackLayoutAlignItemsFirstBaseline:
return maxBaseline - baselineForItem(style, l);
}
}
@@ -78,11 +75,11 @@ static ASStackPositionedLayout stackedLayout(const ASStackLayoutSpecStyle &style
first = NO;
l.layout.position = p + directionPoint(style.direction, 0, crossOffset(style, l, crossSize, maxBaseline));
CGFloat spacingAfterBaseline = (style.direction == ASStackLayoutDirectionVertical && style.baselineRelativeArrangement) ? l.child.descender : 0;
CGFloat spacingAfterBaseline = (style.direction == ASStackLayoutDirectionVertical && style.baselineRelativeArrangement) ? l.layout.size.height - [l.child distanceToBaseline:style.alignItems] : 0;
p = p + directionPoint(style.direction, stackDimension(style.direction, l.layout.size) + l.child.spacingAfter + spacingAfterBaseline, 0);
return l.layout;
});
return {stackedChildren, crossSize, maxBaseline, maxBaseline == 0 ? 0 : maxBaseline - crossSize};
return {stackedChildren, crossSize, maxBaseline};
}
ASStackPositionedLayout ASStackPositionedLayout::compute(const ASStackUnpositionedLayout &unpositionedLayout,