Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't add extraneous truncation token during kCTLineTruncationMiddle. #1297

Merged
merged 2 commits into from
Mar 6, 2019
Merged

Don't add extraneous truncation token during kCTLineTruncationMiddle. #1297

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4ebcbc
Don't add extraneous truncation token during kCTLineTruncationMiddle
wiseoldduck Dec 21, 2018
766c9c5
Expand these comments a little.
wiseoldduck Dec 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Source/Private/TextExperiment/Component/ASTextLayout.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,8 @@ + (ASTextLayout *)layoutWithContainer:(ASTextContainer *)container text:(NSAttri
}
}
int i = 0;
if (type != kCTLineTruncationStart) { // Middle or End/Tail wants text preceding truncated content.
if (type != kCTLineTruncationStart) { // Middle or End/Tail wants to collect some text (at least one line's
// worth) preceding the truncated content, with which to construct a "truncated line".
i = (int)removedLines.count - 1;
while (atLeastOneLine < truncatedWidth && i >= 0) {
if (lastLineText.length > 0 && [lastLineText.string characterAtIndex:lastLineText.string.length - 1] == '\n') { // Explicit newlines are always "long enough".
Expand All @@ -846,7 +847,8 @@ + (ASTextLayout *)layoutWithContainer:(ASTextContainer *)container text:(NSAttri
}
[lastLineText appendAttributedString:truncationToken];
}
if (type != kCTLineTruncationEnd && removedLines.count > 0) { // Middle or Start/Head wants text following truncated content.
if (type != kCTLineTruncationEnd && removedLines.count > 0) { // Middle or Start/Head wants to collect some
// text following the truncated content.
i = 0;
atLeastOneLine = removedLines[i].width;
while (atLeastOneLine < truncatedWidth && i < removedLines.count) {
Expand All @@ -860,7 +862,9 @@ + (ASTextLayout *)layoutWithContainer:(ASTextContainer *)container text:(NSAttri
[lastLineText appendAttributedString:nextLine];
}
}
[lastLineText insertAttributedString:truncationToken atIndex:0];
if (type == kCTLineTruncationStart) {
[lastLineText insertAttributedString:truncationToken atIndex:0];
}
}

CTLineRef ctLastLineExtend = CTLineCreateWithAttributedString((CFAttributedStringRef) lastLineText);
Expand Down