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

Transition callers from 'concat' to 'transform'

Browse Source 
See: https://github.com/flutter/flutter/issues/1080
This commit is contained in:
Ian Hickson 2016-01-07 22:22:16 -08:00
parent 606887a12c
commit 17ef9488ff
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/raw/painting.dart
View File

@ -39,7 +39,7 @@ ui.Picture paint(ui.Rect paintBounds) {
0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0,
0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0,
]); ]);
canvas.concat(scaleMatrix); canvas.transform(scaleMatrix);
paint.color = const ui.Color.fromARGB(128, 0, 255, 0); paint.color = const ui.Color.fromARGB(128, 0, 255, 0);
canvas.drawCircle(ui.Point.origin, radius, paint); canvas.drawCircle(ui.Point.origin, radius, paint);

4
packages/flutter/lib/src/material/material.dart
View File

@ -379,7 +379,7 @@ class _InkSplash extends InkFeature implements InkSplash {
Offset originOffset = MatrixUtils.getAsTranslation(transform); Offset originOffset = MatrixUtils.getAsTranslation(transform);
if (originOffset == null) { if (originOffset == null) {
canvas.save(); canvas.save();
canvas.concat(transform.storage); canvas.transform(transform.storage);
if (clipToReferenceBox) if (clipToReferenceBox)
canvas.clipRect(Point.origin & referenceBox.size); canvas.clipRect(Point.origin & referenceBox.size);
if (repositionToReferenceBox) if (repositionToReferenceBox)
@ -465,7 +465,7 @@ class _InkHighlight extends InkFeature implements InkHighlight {
Offset originOffset = MatrixUtils.getAsTranslation(transform); Offset originOffset = MatrixUtils.getAsTranslation(transform);
if (originOffset == null) { if (originOffset == null) {
canvas.save(); canvas.save();
canvas.concat(transform.storage); canvas.transform(transform.storage);
_paintHighlight(canvas, Point.origin & referenceBox.size, paint); _paintHighlight(canvas, Point.origin & referenceBox.size, paint);
canvas.restore(); canvas.restore();
} else { } else {

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

@ -278,7 +278,7 @@ class PaintingContext {
Matrix4 offsetMatrix = new Matrix4.translationValues(offset.dx, offset.dy, 0.0); Matrix4 offsetMatrix = new Matrix4.translationValues(offset.dx, offset.dy, 0.0);
Matrix4 transformWithOffset = offsetMatrix * transform; Matrix4 transformWithOffset = offsetMatrix * transform;
canvas.save(); canvas.save();
canvas.concat(transformWithOffset.storage); canvas.transform(transformWithOffset.storage);
painter(this, Offset.zero); painter(this, Offset.zero);
canvas.restore(); canvas.restore();
} }

2
packages/flutter_sprites/lib/src/sprite_box.dart
View File

@ -337,7 +337,7 @@ class SpriteBox extends RenderBox {
// Move to correct coordinate space before drawing // Move to correct coordinate space before drawing
canvas.translate(offset.dx, offset.dy); canvas.translate(offset.dx, offset.dy);
canvas.concat(transformMatrix.storage); canvas.transform(transformMatrix.storage);
// Draw the sprite tree // Draw the sprite tree
Matrix4 totalMatrix = new Matrix4.fromFloat64List(canvas.getTotalMatrix()); Matrix4 totalMatrix = new Matrix4.fromFloat64List(canvas.getTotalMatrix());