firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use paragraph getter in TextPainter (#127607)

Browse Source
This commit is contained in:
Tomasz Gucio 2023-05-31 12:14:16 +02:00 committed by GitHub
parent 224667e90f
commit ab3602b7df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/flutter/lib/src/painting/text_painter.dart
View File

@ -369,6 +369,7 @@ class _TextPainterLayoutCacheWithOffset {
TextWidthBasis.parent => clampDouble(layout.maxIntrinsicLineExtent, minWidth, maxWidth), TextWidthBasis.parent => clampDouble(layout.maxIntrinsicLineExtent, minWidth, maxWidth),
}; };
} }
// Try to resize the contentWidth to fit the new input constraints, by just // Try to resize the contentWidth to fit the new input constraints, by just
// adjusting the paint offset (so no line-breaking changes needed). // adjusting the paint offset (so no line-breaking changes needed).
// //
@ -398,8 +399,8 @@ class _TextPainterLayoutCacheWithOffset {
assert(paragraph.width == double.infinity); assert(paragraph.width == double.infinity);
return false; return false;
} }
final double maxIntrinsicWidth = layout._paragraph.maxIntrinsicWidth; final double maxIntrinsicWidth = paragraph.maxIntrinsicWidth;
if ((layout._paragraph.width - maxIntrinsicWidth) > -precisionErrorTolerance && (maxWidth - maxIntrinsicWidth) > -precisionErrorTolerance) { if ((paragraph.width - maxIntrinsicWidth) > -precisionErrorTolerance && (maxWidth - maxIntrinsicWidth) > -precisionErrorTolerance) {
// Adjust the paintOffset and contentWidth to the new input constraints. // Adjust the paintOffset and contentWidth to the new input constraints.
contentWidth = newContentWidth; contentWidth = newContentWidth;
return true; return true;
@ -889,7 +890,7 @@ class TextPainter {
if (span is PlaceholderSpan) { if (span is PlaceholderSpan) {
placeholderCount += 1; placeholderCount += 1;
} }
return value.length >= placeholderCount ; return value.length >= placeholderCount;
}); });
return placeholderCount == value.length; return placeholderCount == value.length;
}()); }());
@ -1129,7 +1130,7 @@ class TextPainter {
return true; return true;
}()); }());
final ui.Paragraph paragraph = layoutCache.layout._paragraph; final ui.Paragraph paragraph = layoutCache.paragraph;
// Unfortunately even if we know that there is only paint changes, there's // Unfortunately even if we know that there is only paint changes, there's
// no API to only make those updates so the paragraph has to be recreated // no API to only make those updates so the paragraph has to be recreated
// and re-laid out. // and re-laid out.