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

Pass the width constraint to the text layout engine if ellipsizing is enabled (#11877)

Browse Source
This commit is contained in:
Jason Simmons 2017-08-31 14:51:11 -07:00 committed by GitHub
parent c5750cd7ea
commit d77955fb1a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/flutter/lib/src/rendering/paragraph.dart
View File

@ -148,7 +148,10 @@ class RenderParagraph extends RenderBox {
} }
void _layoutText({ double minWidth: 0.0, double maxWidth: double.INFINITY }) { void _layoutText({ double minWidth: 0.0, double maxWidth: double.INFINITY }) {
_textPainter.layout(minWidth: minWidth, maxWidth: _softWrap ? maxWidth : double.INFINITY); _textPainter.layout(
minWidth: minWidth,
maxWidth: _softWrap || _overflow == TextOverflow.ellipsis ? maxWidth : double.INFINITY
);
} }
void _layoutTextWithConstraints(BoxConstraints constraints) { void _layoutTextWithConstraints(BoxConstraints constraints) {

2
packages/flutter/test/rendering/paragraph_test.dart
View File

@ -132,7 +132,7 @@ void main() {
expect(paragraph.size.height, equals(lineHeight)); expect(paragraph.size.height, equals(lineHeight));
relayoutWith(maxLines: 3, softWrap: false, overflow: TextOverflow.ellipsis); relayoutWith(maxLines: 3, softWrap: false, overflow: TextOverflow.ellipsis);
expect(paragraph.size.height, equals(2 * lineHeight)); expect(paragraph.size.height, equals(3 * lineHeight));
relayoutWith(maxLines: null, softWrap: false, overflow: TextOverflow.ellipsis); relayoutWith(maxLines: null, softWrap: false, overflow: TextOverflow.ellipsis);
expect(paragraph.size.height, equals(2 * lineHeight)); expect(paragraph.size.height, equals(2 * lineHeight));