From c9d3217c3b86d8474f1f1231c029245fd3a5dcc6 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Thu, 17 Mar 2016 13:25:38 -0700 Subject: [PATCH] Use Canvas#drawParagraph We'll eventually remove Paragraph#paint. Fixes #2694 --- examples/layers/raw/hello_world.dart | 2 +- examples/layers/raw/text.dart | 2 +- packages/flutter/lib/src/painting/text_painter.dart | 2 +- packages/flutter/lib/src/rendering/error.dart | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/layers/raw/hello_world.dart b/examples/layers/raw/hello_world.dart index d624c2823b..6fe0a24578 100644 --- a/examples/layers/raw/hello_world.dart +++ b/examples/layers/raw/hello_world.dart @@ -22,7 +22,7 @@ void beginFrame(Duration timeStamp) { final ui.PictureRecorder recorder = new ui.PictureRecorder(); final ui.Canvas canvas = new ui.Canvas(recorder, physicalBounds); canvas.scale(devicePixelRatio, devicePixelRatio); - paragraph.paint(canvas, new ui.Offset( + canvas.drawParagraph(paragraph, new ui.Offset( (logicalSize.width - paragraph.maxIntrinsicWidth) / 2.0, (logicalSize.height - paragraph.height) / 2.0 )); diff --git a/examples/layers/raw/text.dart b/examples/layers/raw/text.dart index d8e431f864..5f8f6acdd8 100644 --- a/examples/layers/raw/text.dart +++ b/examples/layers/raw/text.dart @@ -21,7 +21,7 @@ ui.Picture paint(ui.Rect paintBounds) { // The paint method of Pargraph draws the contents of the paragraph unto the // 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(); } diff --git a/packages/flutter/lib/src/painting/text_painter.dart b/packages/flutter/lib/src/painting/text_painter.dart index f42390c2f8..acf64af581 100644 --- a/packages/flutter/lib/src/painting/text_painter.dart +++ b/packages/flutter/lib/src/painting/text_painter.dart @@ -294,7 +294,7 @@ class TextPainter { /// Paints the text onto the given canvas at the given offset. void paint(Canvas canvas, Offset offset) { 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) { diff --git a/packages/flutter/lib/src/rendering/error.dart b/packages/flutter/lib/src/rendering/error.dart index a86be469f6..f72a364d2b 100644 --- a/packages/flutter/lib/src/rendering/error.dart +++ b/packages/flutter/lib/src/rendering/error.dart @@ -113,7 +113,7 @@ class RenderErrorBox extends RenderBox { _paragraph.maxWidth = size.width; } _paragraph.layout(); - _paragraph.paint(context.canvas, offset); + context.canvas.drawParagraph(_paragraph, offset); } } catch (e) { } }