DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

libtxt: only apply ellipsizing to the last text run in the line (#5486)

Browse Source 
Paragraph layout breaks the text into lines, and ellipsizing (if applicable)
will truncate the last run of a line at the point where word wrap would have
occurred.

Fixes https://github.com/flutter/flutter/issues/18198
This commit is contained in:
Jason Simmons 2018-06-07 14:24:03 -07:00 committed by GitHub
parent 5964ef2b7c
commit 45fa7e8f3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
third_party/txt/src/txt/paragraph.cc vendored
View File

@ -484,7 +484,9 @@ void Paragraph::Layout(double width, bool force) {
double justify_x_offset = 0;
std::vector<PaintRecord> paint_records;
for (const BidiRun& run : line_runs) {
for (auto line_run_it = line_runs.begin(); line_run_it != line_runs.end();
++line_run_it) {
const BidiRun& run = *line_run_it;
minikin::FontStyle font;
minikin::MinikinPaint minikin_paint;
GetFontAndMinikinPaint(run.style(), &font, &minikin_paint);
@ -503,6 +505,7 @@ void Paragraph::Layout(double width, bool force) {
const std::u16string& ellipsis = paragraph_style_.ellipsis;
std::vector<uint16_t> ellipsized_text;
if (ellipsis.length() && !isinf(width_) && !line_range.hard_break &&
line_run_it == line_runs.end() - 1 &&
(line_number == line_limit - 1 ||
paragraph_style_.unlimited_lines())) {
float ellipsis_width = layout.measureText(
@ -518,7 +521,7 @@ void Paragraph::Layout(double width, bool force) {
// Truncate characters from the text until the ellipsis fits.
size_t truncate_count = 0;
while (truncate_count < text_count &&
text_width + ellipsis_width > width_) {
run_x_offset + text_width + ellipsis_width > width_) {
text_width -= text_advances[text_count - truncate_count - 1];
truncate_count++;
}