move backgroundColor to all classes (#3248)

fabricjs · Sep 11, 2016 · d7157d1 · d7157d1
1 parent 876c9ca
commit d7157d1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/src/shapes/object.class.js b/src/shapes/object.class.js
@@ -1097,20 +1097,44 @@
       if (!noTransform) {
         this.transform(ctx);
       }
+      this._setOpacity(ctx);
+      this._setShadow(ctx);
+      this._renderBackground(ctx);
       this._setStrokeStyles(ctx);
       this._setFillStyles(ctx);
       if (this.transformMatrix) {
         ctx.transform.apply(ctx, this.transformMatrix);
       }
-      this._setOpacity(ctx);
-      this._setShadow(ctx);
       this.clipTo && fabric.util.clipContext(this, ctx);
       this._render(ctx, noTransform);
       this.clipTo && ctx.restore();
 
       ctx.restore();
     },
 
+    /**
+     * Draws a background for the object big as its width and height;
+     * @private
+     * @param {CanvasRenderingContext2D} ctx Context to render on
+     */
+    _renderBackground: function(ctx) {
+      if (!this.backgroundColor) {
+        return;
+      }
+
+      ctx.fillStyle = this.backgroundColor;
+
+      ctx.fillRect(
+        -this.width / 2,
+        -this.height / 2,
+        this.width,
+        this.height
+      );
+      // if there is background color no other shadows
+      // should be casted
+      this._removeShadow(ctx);
+    },
+
     /**
      * @private
      * @param {CanvasRenderingContext2D} ctx Context to render on

diff --git a/src/shapes/text.class.js b/src/shapes/text.class.js
@@ -634,32 +634,10 @@
      * @param {CanvasRenderingContext2D} ctx Context to render on
      */
     _renderTextBackground: function(ctx) {
-      this._renderTextBoxBackground(ctx);
+      this._renderBackground(ctx);
       this._renderTextLinesBackground(ctx);
     },
 
-    /**
-     * @private
-     * @param {CanvasRenderingContext2D} ctx Context to render on
-     */
-    _renderTextBoxBackground: function(ctx) {
-      if (!this.backgroundColor) {
-        return;
-      }
-
-      ctx.fillStyle = this.backgroundColor;
-
-      ctx.fillRect(
-        this._getLeftOffset(),
-        this._getTopOffset(),
-        this.width,
-        this.height
-      );
-      // if there is background color no other shadows
-      // should be casted
-      this._removeShadow(ctx);
-    },
-
     /**
      * @private
      * @param {CanvasRenderingContext2D} ctx Context to render on