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

fixed bug for baseline last

Browse Source
This commit is contained in:
rcancro 2015-08-20 20:43:18 -07:00
parent ff8a7015a5
commit 0a398301b0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsyncDisplayKit/Private/ASStackTextPositionedLayout.mm
View File

@ -39,7 +39,7 @@ static CGFloat baselineOffset(const ASStackTextLayoutSpecStyle &style,
case ASStackTextLayoutBaselineAlignmentFirst: case ASStackTextLayoutBaselineAlignmentFirst:
return maxAscender - textChild.ascender; return maxAscender - textChild.ascender;
case ASStackTextLayoutBaselineAlignmentLast: case ASStackTextLayoutBaselineAlignmentLast:
return maxBaseline + textChild.descender - textChild.ascender; return maxBaseline - baselineForItem(style, l);
case ASStackTextLayoutBaselineAlignmentNone: case ASStackTextLayoutBaselineAlignmentNone:
return 0; return 0;
} }
@ -91,7 +91,7 @@ ASStackTextPositionedLayout ASStackTextPositionedLayout::compute(const ASStackPo
// add the baseline offset. baselineOffset is only valid in the horizontal direction, so we always add to y // add the baseline offset. baselineOffset is only valid in the horizontal direction, so we always add to y
l.position = p + CGPointMake(0, baselineOffset(textStyle, l, maxAscender, maxBaseline)); l.position = p + CGPointMake(0, baselineOffset(textStyle, l, maxAscender, maxBaseline));
// If we are a vertical stack, add the minDescender (it is negative) to the spacing after. This will alter the stack spacing to be on baselines instead of bounding boxes // If we are a vertical stack, add the item's descender (it is negative) to the spacing after. This will alter the stack spacing to be on baselines instead of bounding boxes
CGFloat spacingAfterBaseline = (stackStyle.direction == ASStackLayoutDirectionVertical) ? textChild.descender : 0; CGFloat spacingAfterBaseline = (stackStyle.direction == ASStackLayoutDirectionVertical) ? textChild.descender : 0;
p = p + directionPoint(stackStyle.direction, stackDimension(stackStyle.direction, l.size) + textChild.spacingAfter + spacingAfterBaseline, 0); p = p + directionPoint(stackStyle.direction, stackDimension(stackStyle.direction, l.size) + textChild.spacingAfter + spacingAfterBaseline, 0);