Merge pull request #751 from linshun/iss1665_v2.1.1

add timmjd's commit

Author: SeanLin

cocos2d/sprite_nodes/CCSprite.js

@@ -244,6 +244,7 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
     _texture:null,
     _originalTexture:null,
     _color:null,
+    _colorized:false,
     //
     // Shared data
     //
@@ -912,12 +913,18 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
                     this._rect.size.width = this._texture.width;
                     this._rect.size.height = this._texture.height;
                     context.drawImage(this._texture, posX, -(posY + this._texture.height));
-                } else {
+                } else if(this._colorized) {
                     context.drawImage(this._texture,
                         0, 0,
                         this._rect.size.width, this._rect.size.height,
                         posX, -(posY + this._rect.size.height),
                         this._rect.size.width, this._rect.size.height);
+                } else {
+                    context.drawImage(this._texture,
+                        this._rect.origin.x, this._rect.origin.y,
+                        this._rect.size.width, this._rect.size.height,
+                        posX, -(posY + this._rect.size.height),
+                        this._rect.size.width, this._rect.size.height);
                 }
             }
         } else {
@@ -1440,6 +1447,7 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
             if (cc.renderContextType === cc.CANVAS) {
                 var cacheTextureForColor = cc.TextureCache.getInstance().getTextureColors(this._originalTexture);
                 if (cacheTextureForColor) {
+                    this._colorized = true;
                     //generate color texture cache
                     if (this._texture instanceof HTMLCanvasElement && !this._rectRotated) {
                         cc.generateTintImage(this.getTexture(), cacheTextureForColor, this._color, this.getTextureRect(), this._texture);

extensions/GUI/CCControlExtension/CCScale9Sprite.js

@@ -237,7 +237,6 @@ cc.Scale9Sprite = cc.Node.extend({
     initWithBatchNode:function (batchNode, rect, unused, capInsets) {
         if (batchNode) {
             this.updateWithBatchNode(batchNode, rect, unused, capInsets);
-            this.setAnchorPoint(cc.p(0.5, 0.5));
         }
         this.m_positionsAreDirty = true;
         return true;
@@ -377,16 +376,27 @@ cc.Scale9Sprite = cc.Node.extend({
         this._spriteRect = rect;
         this._originalSize = new cc.Size(rect.size.width, rect.size.height);
         this._preferredSize = this._originalSize;
-        this._capInsetsInternal = capInsets;
+        this._capInsetsInternal = capInsets || cc.RectZero();
 
         // If there is no specified center region
-        if (cc.Rect.CCRectEqualToRect(this._capInsetsInternal, cc.RectZero())) {
+        if (cc.Rect.CCRectEqualToRect(this._capInsetsInternal, cc.RectZero()) ||
+            cc.Rect.CCRectEqualToRect(this._capInsetsInternal, this._spriteRect)) {
             // Apply the 3x3 grid format
             this._capInsetsInternal = cc.RectMake(
                 rect.origin.x + this._originalSize.width / 3,
                 rect.origin.y + this._originalSize.height / 3,
                 this._originalSize.width / 3,
                 this._originalSize.height / 3);
+            this._capInsets = null;
+        }
+        else
+        {
+            this._capInsetsInternal = cc.RectMake(
+                rect.origin.x + this._capInsetsInternal.origin.x,
+                rect.origin.y + this._capInsetsInternal.origin.y,
+                this._capInsetsInternal.size.width,
+                this._capInsetsInternal.size.height
+            );
         }
 
         // Get the image edges
@@ -456,6 +466,7 @@ cc.Scale9Sprite = cc.Node.extend({
 
         this.setContentSize(rect.size);
         this.addChild(this._scale9Image);
+        this.setAnchorPoint(cc.p(0.5, 0.5));
         return true;
     },