From b67cc4b589ac1284e1044e8297144354a6f4684b Mon Sep 17 00:00:00 2001
From: Eric Rowell <erowell83@gmail.com>
Date: Fri, 23 Nov 2012 22:21:19 -0800
Subject: [PATCH] Text shape now depends on Rect for rect drawing func

---
 src/shapes/Rect.js | 24 ++++++++++-----------
 src/shapes/Text.js | 54 +++-------------------------------------------
 2 files changed, 15 insertions(+), 63 deletions(-)

diff --git a/src/shapes/Rect.js b/src/shapes/Rect.js
index d6242e33..a8baf00e 100644
--- a/src/shapes/Rect.js
+++ b/src/shapes/Rect.js
@@ -24,24 +24,24 @@ Kinetic.Rect.prototype = {
     },
     drawFunc: function(context) {
         context.beginPath();
-        if(this.attrs.cornerRadius === 0) {
+        var cornerRadius = this.getCornerRadius(), width = this.getWidth(), height = this.getHeight();
+        if(cornerRadius === 0) {
             // simple rect - don't bother doing all that complicated maths stuff.
-            context.rect(0, 0, this.attrs.width, this.attrs.height);
+            context.rect(0, 0, width, height);
         }
         else {
             // arcTo would be nicer, but browser support is patchy (Opera)
-            context.moveTo(this.attrs.cornerRadius, 0);
-            context.lineTo(this.attrs.width - this.attrs.cornerRadius, 0);
-            context.arc(this.attrs.width - this.attrs.cornerRadius, this.attrs.cornerRadius, this.attrs.cornerRadius, Math.PI * 3 / 2, 0, false);
-            context.lineTo(this.attrs.width, this.attrs.height - this.attrs.cornerRadius);
-            context.arc(this.attrs.width - this.attrs.cornerRadius, this.attrs.height - this.attrs.cornerRadius, this.attrs.cornerRadius, 0, Math.PI / 2, false);
-            context.lineTo(this.attrs.cornerRadius, this.attrs.height);
-            context.arc(this.attrs.cornerRadius, this.attrs.height - this.attrs.cornerRadius, this.attrs.cornerRadius, Math.PI / 2, Math.PI, false);
-            context.lineTo(0, this.attrs.cornerRadius);
-            context.arc(this.attrs.cornerRadius, this.attrs.cornerRadius, this.attrs.cornerRadius, Math.PI, Math.PI * 3 / 2, false);
+            context.moveTo(cornerRadius, 0);
+            context.lineTo(width - cornerRadius, 0);
+            context.arc(width - cornerRadius, cornerRadius, cornerRadius, Math.PI * 3 / 2, 0, false);
+            context.lineTo(width, height - cornerRadius);
+            context.arc(width - cornerRadius, height - cornerRadius, cornerRadius, 0, Math.PI / 2, false);
+            context.lineTo(cornerRadius, height);
+            context.arc(cornerRadius, height - cornerRadius, cornerRadius, Math.PI / 2, Math.PI, false);
+            context.lineTo(0, cornerRadius);
+            context.arc(cornerRadius, cornerRadius, cornerRadius, Math.PI, Math.PI * 3 / 2, false);
         }
         context.closePath();
-
         this.fillStroke(context);
     }
 };
diff --git a/src/shapes/Text.js b/src/shapes/Text.js
index 5f29ffac..4f0e4538 100644
--- a/src/shapes/Text.js
+++ b/src/shapes/Text.js
@@ -46,32 +46,9 @@ Kinetic.Text.prototype = {
     },
     drawFunc: function(context) {
         // draw rect
-        context.beginPath();
-        var boxWidth = this.getWidth();
-        var boxHeight = this.getHeight();
+        Kinetic.Rect.prototype.drawFunc.call(this, context);
 
-        if(this.attrs.cornerRadius === 0) {
-            // simple rect - don't bother doing all that complicated maths stuff.
-            context.rect(0, 0, boxWidth, boxHeight);
-        }
-        else {
-            // arcTo would be nicer, but browser support is patchy (Opera)
-            context.moveTo(this.attrs.cornerRadius, 0);
-            context.lineTo(boxWidth - this.attrs.cornerRadius, 0);
-            context.arc(boxWidth - this.attrs.cornerRadius, this.attrs.cornerRadius, this.attrs.cornerRadius, Math.PI * 3 / 2, 0, false);
-            context.lineTo(boxWidth, boxHeight - this.attrs.cornerRadius);
-            context.arc(boxWidth - this.attrs.cornerRadius, boxHeight - this.attrs.cornerRadius, this.attrs.cornerRadius, 0, Math.PI / 2, false);
-            context.lineTo(this.attrs.cornerRadius, boxHeight);
-            context.arc(this.attrs.cornerRadius, boxHeight - this.attrs.cornerRadius, this.attrs.cornerRadius, Math.PI / 2, Math.PI, false);
-            context.lineTo(0, this.attrs.cornerRadius);
-            context.arc(this.attrs.cornerRadius, this.attrs.cornerRadius, this.attrs.cornerRadius, Math.PI, Math.PI * 3 / 2, false);
-        }
-        context.closePath();
-
-        this.fillStroke(context);
-        /*
-         * draw text
-         */
+        // draw text
         var p = this.attrs.padding;
         var lineHeightPx = this.attrs.lineHeight * this.getTextHeight();
         var textArr = this.textArr;
@@ -102,32 +79,7 @@ Kinetic.Text.prototype = {
         }
         context.restore();
     },
-    drawHitFunc: function(context) {
-        // draw rect
-        context.beginPath();
-        var boxWidth = this.getWidth();
-        var boxHeight = this.getHeight();
-
-        if(this.attrs.cornerRadius === 0) {
-            // simple rect - don't bother doing all that complicated maths stuff.
-            context.rect(0, 0, boxWidth, boxHeight);
-        }
-        else {
-            // arcTo would be nicer, but browser support is patchy (Opera)
-            context.moveTo(this.attrs.cornerRadius, 0);
-            context.lineTo(boxWidth - this.attrs.cornerRadius, 0);
-            context.arc(boxWidth - this.attrs.cornerRadius, this.attrs.cornerRadius, this.attrs.cornerRadius, Math.PI * 3 / 2, 0, false);
-            context.lineTo(boxWidth, boxHeight - this.attrs.cornerRadius);
-            context.arc(boxWidth - this.attrs.cornerRadius, boxHeight - this.attrs.cornerRadius, this.attrs.cornerRadius, 0, Math.PI / 2, false);
-            context.lineTo(this.attrs.cornerRadius, boxHeight);
-            context.arc(this.attrs.cornerRadius, boxHeight - this.attrs.cornerRadius, this.attrs.cornerRadius, Math.PI / 2, Math.PI, false);
-            context.lineTo(0, this.attrs.cornerRadius);
-            context.arc(this.attrs.cornerRadius, this.attrs.cornerRadius, this.attrs.cornerRadius, Math.PI, Math.PI * 3 / 2, false);
-        }
-        context.closePath();
-
-        this.fillStroke(context);
-    },
+    drawHitFunc: Kinetic.Rect.prototype.drawFunc,
     /**
      * set text
      * @name setText