Fix transformMatrix not affecting text. Closes fabricjs#1031

mizzack · Dec 7, 2013 · 37afbc2 · 37afbc2
1 parent 6f88508
commit 37afbc2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/dist/all.js b/dist/all.js
@@ -17929,6 +17929,10 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass(/** @lends fabric.Imag
       if (!this.visible) return;
 
       ctx.save();
+      var m = this.transformMatrix;
+      if (m && !this.group) {
+        ctx.setTransform(m[0], m[1], m[2], m[3], m[4], m[5]);
+      }
       this._render(ctx);
       if (!noTransform && this.active) {
         this.drawBorders(ctx);

diff --git a/dist/all.min.js b/dist/all.min.js
diff --git a/dist/all.min.js.gz b/dist/all.min.js.gz
diff --git a/dist/all.require.js b/dist/all.require.js
@@ -17929,6 +17929,10 @@ fabric.Image.filters.BaseFilter = fabric.util.createClass(/** @lends fabric.Imag
       if (!this.visible) return;
 
       ctx.save();
+      var m = this.transformMatrix;
+      if (m && !this.group) {
+        ctx.setTransform(m[0], m[1], m[2], m[3], m[4], m[5]);
+      }
       this._render(ctx);
       if (!noTransform && this.active) {
         this.drawBorders(ctx);

diff --git a/src/shapes/text.class.js b/src/shapes/text.class.js
@@ -767,6 +767,10 @@
       if (!this.visible) return;
 
       ctx.save();
+      var m = this.transformMatrix;
+      if (m && !this.group) {
+        ctx.setTransform(m[0], m[1], m[2], m[3], m[4], m[5]);
+      }
       this._render(ctx);
       if (!noTransform && this.active) {
         this.drawBorders(ctx);