scaling now has a different behavior

Author: timmjd

extensions/GUI/CCControlExtension/CCScale9Sprite.js

@@ -93,67 +93,36 @@ cc.Scale9Sprite = cc.Node.extend({
         this._bottom.setAnchorPoint(cc.p(0, 0));
         this._centre.setAnchorPoint(cc.p(0, 0));
 
-        if(!this._capInsets)
-        {
-            var equalWidth = size.width / 3;
-            var equalHeight = size.height / 3;
-
-            var equalWidthScale = equalWidth / this._centre.getContentSize().width;
-            var equalHeightScale = equalHeight / this._centre.getContentSize().height;
-
-            this._topLeft.setScale(equalWidthScale, equalHeightScale);
-            this._top.setScale(equalWidthScale, equalHeightScale);
-            this._topRight.setScale(equalWidthScale, equalHeightScale);
-            this._left.setScale(equalWidthScale, equalHeightScale);
-            this._centre.setScale(equalWidthScale, equalHeightScale);
-            this._right.setScale(equalWidthScale, equalHeightScale);
-            this._bottomLeft.setScale(equalWidthScale, equalHeightScale);
-            this._bottom.setScale(equalWidthScale, equalHeightScale);
-            this._bottomRight.setScale(equalWidthScale, equalHeightScale);
-
-            this._topLeft.setPosition(cc.p(0, 2 * equalHeight));
-            this._top.setPosition(cc.p(equalWidth, 2 * equalHeight));
-            this._topRight.setPosition(cc.p(2 * equalWidth, 2 * equalHeight));
-            this._left.setPosition(cc.p(0, equalHeight));
-            this._centre.setPosition(cc.p(equalWidth, equalHeight));
-            this._right.setPosition(cc.p(2 * equalWidth, equalHeight));
-            this._bottomLeft.setPosition(cc.p(0, 0));
-            this._bottom.setPosition(cc.p(equalWidth, 0));
-            this._bottomRight.setPosition(cc.p(2 * equalWidth, 0));
-        }
-        else
-        {
-            var sizableWidth = size.width - this._topLeft.getContentSize().width - this._topRight.getContentSize().width;
-            var sizableHeight = size.height - this._topLeft.getContentSize().height - this._bottomRight.getContentSize().height;
-            var horizontalScale = sizableWidth / this._centre.getContentSize().width;
-            var verticalScale = sizableHeight / this._centre.getContentSize().height;
-            this._centre.setScaleX(horizontalScale);
-            this._centre.setScaleY(verticalScale);
-            var rescaledWidth = this._centre.getContentSize().width * horizontalScale;
-            var rescaledHeight = this._centre.getContentSize().height * verticalScale;
-
-            var leftWidth = this._bottomLeft.getContentSize().width;
-            var bottomHeight = this._bottomLeft.getContentSize().height;
-
-            // Position corners
-            this._bottomLeft.setPosition(cc.p(0, 0));
-            this._bottomRight.setPosition(cc.p(leftWidth + rescaledWidth, 0));
-            this._topLeft.setPosition(cc.p(0, bottomHeight + rescaledHeight));
-            this._topRight.setPosition(cc.p(leftWidth + rescaledWidth, bottomHeight + rescaledHeight));
-
-            // Scale and position borders
-            this._left.setPosition(cc.p(0, bottomHeight));
-            this._left.setScaleY(verticalScale);
-            this._right.setPosition(cc.p(leftWidth + rescaledWidth, bottomHeight));
-            this._right.setScaleY(verticalScale);
-            this._bottom.setPosition(cc.p(leftWidth, 0));
-            this._bottom.setScaleX(horizontalScale);
-            this._top.setPosition(cc.p(leftWidth, bottomHeight + rescaledHeight));
-            this._top.setScaleX(horizontalScale);
-
-            // Position centre
-            this._centre.setPosition(cc.p(leftWidth, bottomHeight));
-        }
+        var sizableWidth = size.width - this._topLeft.getContentSize().width - this._topRight.getContentSize().width;
+        var sizableHeight = size.height - this._topLeft.getContentSize().height - this._bottomRight.getContentSize().height;
+        var horizontalScale = sizableWidth / this._centre.getContentSize().width;
+        var verticalScale = sizableHeight / this._centre.getContentSize().height;
+        this._centre.setScaleX(horizontalScale);
+        this._centre.setScaleY(verticalScale);
+        var rescaledWidth = this._centre.getContentSize().width * horizontalScale;
+        var rescaledHeight = this._centre.getContentSize().height * verticalScale;
+
+        var leftWidth = this._bottomLeft.getContentSize().width;
+        var bottomHeight = this._bottomLeft.getContentSize().height;
+
+        // Position corners
+        this._bottomLeft.setPosition(cc.p(0, 0));
+        this._bottomRight.setPosition(cc.p(leftWidth + rescaledWidth, 0));
+        this._topLeft.setPosition(cc.p(0, bottomHeight + rescaledHeight));
+        this._topRight.setPosition(cc.p(leftWidth + rescaledWidth, bottomHeight + rescaledHeight));
+
+        // Scale and position borders
+        this._left.setPosition(cc.p(0, bottomHeight));
+        this._left.setScaleY(verticalScale);
+        this._right.setPosition(cc.p(leftWidth + rescaledWidth, bottomHeight));
+        this._right.setScaleY(verticalScale);
+        this._bottom.setPosition(cc.p(leftWidth, 0));
+        this._bottom.setScaleX(horizontalScale);
+        this._top.setPosition(cc.p(leftWidth, bottomHeight + rescaledHeight));
+        this._top.setScaleX(horizontalScale);
+
+        // Position centre
+        this._centre.setPosition(cc.p(leftWidth, bottomHeight));
     },
 
     ctor:function () {