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

Use composed attributed truncation string for underlying drawing text

Browse Source
This commit is contained in:
Levi McCallum
2015-11-15 00:07:52 -08:00
committed by Levi McCallum
parent a8e6aebe9c
commit c1f4456fd5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AsyncDisplayKit/ASTextNode.mm
View File

@@ -77,7 +77,7 @@ static NSString *ASTextNodeTruncationTokenAttributeName = @"ASTextNodeTruncation
NSArray *_exclusionPaths;
NSAttributedString *_truncationAttributedString;
NSAttributedString *_composedTruncationString;
NSString *_highlightedLinkAttributeName;
id _highlightedLinkAttributeValue;
@@ -113,7 +113,7 @@ static NSString *ASTextNodeTruncationTokenAttributeName = @"ASTextNodeTruncation
self.needsDisplayOnBoundsChange = YES;
_truncationMode = NSLineBreakByWordWrapping;
_truncationAttributedString = DefaultTruncationAttributedString();
_composedTruncationString = DefaultTruncationAttributedString();
// The common case is for a text node to be non-opaque and blended over some background.
self.opaque = NO;
@@ -165,7 +165,7 @@ static NSString *ASTextNodeTruncationTokenAttributeName = @"ASTextNodeTruncation
- (NSString *)description
{
NSString *plainString = [[_attributedString string] stringByTrimmingCharactersInSet:[NSCharacterSet newlineCharacterSet]];
NSString *truncationString = [_truncationAttributedString string];
NSString *truncationString = [_composedTruncationString string];
if (plainString.length > 50)
plainString = [[plainString substringToIndex:50] stringByAppendingString:@"\u2026"];
return [NSString stringWithFormat:@"<%@: %p; text = \"%@\"; truncation string = \"%@\"; frame = %@>", self.class, self, plainString, truncationString, self.nodeLoaded ? NSStringFromCGRect(self.layer.frame) : nil];
@@ -261,7 +261,7 @@ static NSString *ASTextNodeTruncationTokenAttributeName = @"ASTextNodeTruncation
{
return {
.attributedString = _attributedString,
.truncationAttributedString = _truncationAttributedString,
.truncationAttributedString = _composedTruncationString,
.lineBreakMode = _truncationMode,
.maximumNumberOfLines = _maximumNumberOfLines,
.exclusionPaths = _exclusionPaths,
@@ -1002,7 +1002,7 @@ static NSAttributedString *DefaultTruncationAttributedString()
- (void)_invalidateTruncationString
{
_truncationAttributedString = [self _prepareTruncationStringForDrawing:[self _truncationAttributedString]];
_composedTruncationString = [self _prepareTruncationStringForDrawing:[self _composedTruncationString]];
[self _invalidateRenderer];
ASDisplayNodeRespectThreadAffinityOfNode(self, ^{
[self setNeedsDisplay];
@@ -1035,7 +1035,7 @@ static NSAttributedString *DefaultTruncationAttributedString()
* additional truncation message and a truncation attributed string, they will
* be properly composed.
*/
- (NSAttributedString *)_truncationAttributedString
- (NSAttributedString *)_composedTruncationString
{
// Short circuit if we only have one or the other.
if (!_additionalTruncationMessage) {