github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable use of ParagraphConstrains const ctor (#26990)

Browse Source 
All embedders of Flutter within Google have all been updated to an
engine version that includes the const constructor added in
flutter/engine#7346 and rolled into the framework in
flutter/flutter#26252.

This reverts commit 88b77a7d0f.

This fixes https://github.com/flutter/flutter/issues/26390.
This commit is contained in:
Chris Bracken 2019-01-23 16:32:23 -08:00 committed by GitHub
parent ded49cda27
commit 65a70bc7d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/layers/raw/text.dart
View File

@ -84,9 +84,7 @@ void main() {
// Next, we supply a width that the text is permitted to occupy and we ask // Next, we supply a width that the text is permitted to occupy and we ask
// the paragraph to the visual position of each its glyphs as well as its // the paragraph to the visual position of each its glyphs as well as its
// overall size, subject to its sizing constraints. // overall size, subject to its sizing constraints.
// TODO(cbracken): use const constructor. https://github.com/flutter/flutter/issues/26390 ..layout(const ui.ParagraphConstraints(width: 180.0));
// ignore:prefer_const_constructors
..layout(ui.ParagraphConstraints(width: 180.0));
// Finally, we register our beginFrame callback and kick off the first frame. // Finally, we register our beginFrame callback and kick off the first frame.
ui.window.onBeginFrame = beginFrame; ui.window.onBeginFrame = beginFrame;

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

@ -242,9 +242,7 @@ class TextPainter {
builder.pushStyle(text.style.getTextStyle(textScaleFactor: textScaleFactor)); builder.pushStyle(text.style.getTextStyle(textScaleFactor: textScaleFactor));
builder.addText(' '); builder.addText(' ');
_layoutTemplate = builder.build() _layoutTemplate = builder.build()
// TODO(cbracken): use const constructor. https://github.com/flutter/flutter/issues/26390 ..layout(const ui.ParagraphConstraints(width: double.infinity));
// ignore:prefer_const_constructors
..layout(ui.ParagraphConstraints(width: double.infinity));
} }
return _layoutTemplate.height; return _layoutTemplate.height;
} }

4
packages/flutter/test/engine/paragraph_builder_test.dart
View File

@ -13,9 +13,7 @@ void main() {
final Paragraph paragraph = builder.build(); final Paragraph paragraph = builder.build();
expect(paragraph, isNotNull); expect(paragraph, isNotNull);
// TODO(cbracken): use const constructor. https://github.com/flutter/flutter/issues/26390 paragraph.layout(const ParagraphConstraints(width: 800.0));
// ignore:prefer_const_constructors
paragraph.layout(ParagraphConstraints(width: 800.0));
expect(paragraph.width, isNonZero); expect(paragraph.width, isNonZero);
expect(paragraph.height, isNonZero); expect(paragraph.height, isNonZero);
}); });

4
packages/flutter/test/engine/paragraph_test.dart
View File

@ -20,9 +20,7 @@ void main() {
)); ));
builder.addText('Test'); builder.addText('Test');
final Paragraph paragraph = builder.build(); final Paragraph paragraph = builder.build();
// TODO(cbracken): use const constructor. https://github.com/flutter/flutter/issues/26390 paragraph.layout(const ParagraphConstraints(width: 400.0));
// ignore:prefer_const_constructors
paragraph.layout(ParagraphConstraints(width: 400.0));
expect(paragraph.height, closeTo(fontSize, 0.001)); expect(paragraph.height, closeTo(fontSize, 0.001));
expect(paragraph.width, closeTo(400.0, 0.001)); expect(paragraph.width, closeTo(400.0, 0.001));