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

Use Canvas#drawParagraph

Browse Source 
We'll eventually remove Paragraph#paint.

Fixes #2694
This commit is contained in:
Adam Barth 2016-03-17 13:25:38 -07:00
parent 50a249e3ec
commit c9d3217c3b
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/layers/raw/hello_world.dart
View File

@ -22,7 +22,7 @@ void beginFrame(Duration timeStamp) {
final ui.PictureRecorder recorder = new ui.PictureRecorder(); final ui.PictureRecorder recorder = new ui.PictureRecorder();
final ui.Canvas canvas = new ui.Canvas(recorder, physicalBounds); final ui.Canvas canvas = new ui.Canvas(recorder, physicalBounds);
canvas.scale(devicePixelRatio, devicePixelRatio); canvas.scale(devicePixelRatio, devicePixelRatio);
paragraph.paint(canvas, new ui.Offset( canvas.drawParagraph(paragraph, new ui.Offset(
(logicalSize.width - paragraph.maxIntrinsicWidth) / 2.0, (logicalSize.width - paragraph.maxIntrinsicWidth) / 2.0,
(logicalSize.height - paragraph.height) / 2.0 (logicalSize.height - paragraph.height) / 2.0
)); ));

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

@ -21,7 +21,7 @@ ui.Picture paint(ui.Rect paintBounds) {
// The paint method of Pargraph draws the contents of the paragraph unto the // The paint method of Pargraph draws the contents of the paragraph unto the
// given canvas. // given canvas.
paragraph.paint(canvas, new ui.Offset(paragraph.maxWidth / -2.0, (paragraph.maxWidth / 2.0) - 125)); canvas.drawParagraph(paragraph, new ui.Offset(paragraph.maxWidth / -2.0, (paragraph.maxWidth / 2.0) - 125));
return recorder.endRecording(); return recorder.endRecording();
} }

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

@ -294,7 +294,7 @@ class TextPainter {
/// Paints the text onto the given canvas at the given offset. /// Paints the text onto the given canvas at the given offset.
void paint(Canvas canvas, Offset offset) { void paint(Canvas canvas, Offset offset) {
assert(!_needsLayout && "Please call layout() before paint() to position the text before painting it." is String); assert(!_needsLayout && "Please call layout() before paint() to position the text before painting it." is String);
_paragraph.paint(canvas, offset); canvas.drawParagraph(_paragraph, offset);
} }
Offset _getOffsetFromUpstream(int offset, Rect caretPrototype) { Offset _getOffsetFromUpstream(int offset, Rect caretPrototype) {

2
packages/flutter/lib/src/rendering/error.dart
View File

@ -113,7 +113,7 @@ class RenderErrorBox extends RenderBox {
_paragraph.maxWidth = size.width; _paragraph.maxWidth = size.width;
} }
_paragraph.layout(); _paragraph.layout();
_paragraph.paint(context.canvas, offset); context.canvas.drawParagraph(_paragraph, offset);
} }
} catch (e) { } } catch (e) { }
} }