issue #4174 fix scale bug for button.

Author: xingsenma

extensions/CocoStudio/GUI/UIWidgets/UIButton.js

@@ -156,6 +156,14 @@ ccs.Button = ccs.Widget.extend(/** @lends ccs.Button# */{
         this.setBright(this._bright);
     },
 
+    /**
+     *  Get button is using scale9 renderer or not.
+     * @returns {Boolean}
+     */
+    isScale9Enabled:function(){
+        return this._scale9Enabled;
+    },
+
     /**
      * ignoreContentAdaptWithSize
      * @param {Boolean} ignore
@@ -348,6 +356,14 @@ ccs.Button = ccs.Widget.extend(/** @lends ccs.Button# */{
         this._buttonNormalRenderer.setCapInsets(capInsets);
     },
 
+    /**
+     *  Get normal renderer cap insets  .
+     * @returns {cc.Rect}
+     */
+    getCapInsetNormalRenderer:function(){
+        return this._capInsetsNormal;
+    },
+
     /**
      * Sets capinsets for button, if button is using scale9 renderer.
      * @param {cc.Rect} capInsets
@@ -360,6 +376,14 @@ ccs.Button = ccs.Widget.extend(/** @lends ccs.Button# */{
         this._buttonClickedRenderer.setCapInsets(capInsets);
     },
 
+    /**
+     *  Get pressed renderer cap insets  .
+     * @returns {cc.Rect}
+     */
+    getCapInsetPressedRenderer:function(){
+        return this._capInsetsPressed;
+    },
+
     /**
      * Sets capinsets for button, if button is using scale9 renderer.
      * @param {cc.Rect} capInsets
@@ -372,6 +396,14 @@ ccs.Button = ccs.Widget.extend(/** @lends ccs.Button# */{
         this._buttonDisableRenderer.setCapInsets(capInsets);
     },
 
+    /**
+     *  Get disable renderer cap insets  .
+     * @returns {cc.Rect}
+     */
+    getCapInsetDisabledRenderer:function(){
+        return this._capInsetsDisabled;
+    },
+
     onPressStateChangedToNormal: function () {
         this._buttonNormalRenderer.setVisible(true);
         this._buttonClickedRenderer.setVisible(false);
@@ -390,8 +422,7 @@ ccs.Button = ccs.Widget.extend(/** @lends ccs.Button# */{
             }
         } else {
             this._buttonNormalRenderer.stopAllActions();
-            var zoomAction = cc.ScaleTo.create(0.05, this._normalTextureScaleXInSize, this._normalTextureScaleYInSize);
-            this._buttonNormalRenderer.runAction(zoomAction);
+            this._buttonNormalRenderer.setScale(this._normalTextureScaleXInSize, this._normalTextureScaleYInSize);
         }
     },
 
@@ -416,8 +447,7 @@ ccs.Button = ccs.Widget.extend(/** @lends ccs.Button# */{
             this._buttonClickedRenderer.setVisible(true);
             this._buttonDisableRenderer.setVisible(false);
             this._buttonNormalRenderer.stopAllActions();
-            var zoomAction = cc.ScaleTo.create(0.05, this._pressedTextureScaleXInSize + 0.1, this._pressedTextureScaleYInSize + 0.1);
-            this._buttonNormalRenderer.runAction(zoomAction);
+            this._buttonNormalRenderer.setScale(this._normalTextureScaleXInSize + 0.1, this._normalTextureScaleYInSize + 0.1);
         }
     },
 

extensions/CocoStudio/GUI/UIWidgets/UITextField.js

@@ -283,7 +283,7 @@ ccs.TextField = ccs.Widget.extend(/** @lends ccs.TextField# */{
     },
 
     /**
-     * set touch size
+     * Set touch size.
      * @param {cc.Size} size
      */
     setTouchSize: function (size) {
@@ -292,6 +292,14 @@ ccs.TextField = ccs.Widget.extend(/** @lends ccs.TextField# */{
         this._touchHeight = size.height;
     },
 
+    /**
+     * Get touch size.
+     * @returns {cc.Size}
+     */
+    getTouchSize:function(){
+        return cc.size(this._touchWidth,this._touchHeight);
+    },
+
     /**
      *  Changes the string value of textField.
      * @param {String} text
@@ -323,6 +331,13 @@ ccs.TextField = ccs.Widget.extend(/** @lends ccs.TextField# */{
         this.textfieldRendererScaleChangedWithSize();
     },
 
+    /**
+     * @returns {String}
+     */
+    getPlaceHolder:function(){
+        return this._textFieldRender.getPlaceHolder();
+    },
+
     /**
      * @param {cc.Size} size
      */
@@ -331,6 +346,13 @@ ccs.TextField = ccs.Widget.extend(/** @lends ccs.TextField# */{
         this.textfieldRendererScaleChangedWithSize();
     },
 
+    /**
+     * @returns {Number}
+     */
+    getFontSize:function(){
+        return this._textFieldRender.getFontSize();
+    },
+
     /**
      * @param {String} name
      */
@@ -339,6 +361,13 @@ ccs.TextField = ccs.Widget.extend(/** @lends ccs.TextField# */{
         this.textfieldRendererScaleChangedWithSize();
     },
 
+    /**
+     * @returns {String}
+     */
+    getFontName:function(){
+        return this._textFieldRender.getFontName();
+    },
+
     /**
      * detach with IME
      */
@@ -415,13 +444,20 @@ ccs.TextField = ccs.Widget.extend(/** @lends ccs.TextField# */{
     },
 
     /**
-     * @param {String} enable
+     * @param {String} styleText
      */
     setPasswordStyleText: function (styleText) {
         this._textFieldRender.setPasswordStyleText(styleText);
         this._passwordStyleText = styleText;
     },
 
+    /**
+     * @returns {String}
+     */
+    getPasswordStyleText:function(){
+        return this._passwordStyleText;
+    },
+
     update: function (dt) {
         if (this.getAttachWithIME()) {
             this.attachWithIMEEvent();