Merge pull request cocos2d#2647 from dingpinglv/Iss1267_MigrateUI

dingpinglv · dingpinglv · commit 2a9cda01d1bd · 2015-01-27T15:19:22.000+08:00
Fixed cocos2d/cocos2d-js/cocos2d#1267: migrated the up-to-date -x UI
diff --git a/extensions/ccui/layouts/UILayoutComponent.js b/extensions/ccui/layouts/UILayoutComponent.js
@@ -66,6 +66,8 @@ ccui.LayoutComponent = cc.Component.extend({
     _usingPercentHeight: false,
 
     _actived: true,
+    _isPercentOnly: false,
+
     ctor: function () {
         this._name = ccui.LayoutComponent.NAME;
     },
@@ -425,10 +427,17 @@ ccui.LayoutComponent = cc.Component.extend({
             this._usingPercentHeight = false;
     },
 
+    setPercentOnlyEnabled: function(enable){
+        this._isPercentOnly = enable;
+    },
+
     setActiveEnabled: function (enable) {
         this._actived = enable;
     },
     refreshLayout: function () {
+        if(!this._actived)
+            return;
+
         var parent = this._getOwnerParent();
         if (parent == null)
             return;
@@ -439,7 +448,7 @@ ccui.LayoutComponent = cc.Component.extend({
 
         switch (this._horizontalEdge) {
             case ccui.LayoutComponent.horizontalEdge.NONE:
-                if (this._usingStretchWidth) {
+                if (this._usingStretchWidth && !this._isPercentOnly) {
                     ownerSize.width = parentSize.width * this._percentWidth;
                     ownerPosition.x = this._leftMargin + ownerAnchor.x * ownerSize.width;
                 } else {
@@ -450,31 +459,40 @@ ccui.LayoutComponent = cc.Component.extend({
                 }
                 break;
             case ccui.LayoutComponent.horizontalEdge.LEFT:
+                if(this._isPercentOnly)
+                    break;
                 if (this._usingPercentWidth || this._usingStretchWidth)
                     ownerSize.width = parentSize.width * this._percentWidth;
                 ownerPosition.x = this._leftMargin + ownerAnchor.x * ownerSize.width;
                 break;
             case ccui.LayoutComponent.horizontalEdge.RIGHT:
+                if(this._isPercentOnly)
+                    break;
                 if (this._usingPercentWidth || this._usingStretchWidth)
                     ownerSize.width = parentSize.width * this._percentWidth;
                 ownerPosition.x = parentSize.width - (this._rightMargin + (1 - ownerAnchor.x) * ownerSize.width);
                 break;
             case ccui.LayoutComponent.horizontalEdge.CENTER:
-                if (this._usingPercentWidth || this._usingStretchWidth) {
+                if(this._isPercentOnly)
+                    break;
+                if (this._usingStretchWidth) {
                     ownerSize.width = parentSize.width - this._leftMargin - this._rightMargin;
                     if (ownerSize.width < 0)
                         ownerSize.width = 0;
                     ownerPosition.x = this._leftMargin + ownerAnchor.x * ownerSize.width;
-                } else
+                } else {
+                    if (this._usingPercentWidth)
+                        ownerSize.width = parentSize.width * this._percentWidth;
                     ownerPosition.x = parentSize.width * this._positionPercentX;
+                }
                 break;
             default:
                 break;
         }
 
         switch (this._verticalEdge) {
             case ccui.LayoutComponent.verticalEdge.NONE:
-                if (this._usingStretchHeight) {
+                if (this._usingStretchHeight && !this._isPercentOnly) {
                     ownerSize.height = parentSize.height * this._percentHeight;
                     ownerPosition.y = this._bottomMargin + ownerAnchor.y * ownerSize.height;
                 } else {
@@ -485,23 +503,32 @@ ccui.LayoutComponent = cc.Component.extend({
                 }
                 break;
             case ccui.LayoutComponent.verticalEdge.BOTTOM:
+                if(this._isPercentOnly)
+                    break;
                 if (this._usingPercentHeight || this._usingStretchHeight)
                     ownerSize.height = parentSize.height * this._percentHeight;
                 ownerPosition.y = this._bottomMargin + ownerAnchor.y * ownerSize.height;
                 break;
             case ccui.LayoutComponent.verticalEdge.TOP:
+                if(this._isPercentOnly)
+                    break;
                 if (this._usingPercentHeight || this._usingStretchHeight)
                     ownerSize.height = parentSize.height * this._percentHeight;
                 ownerPosition.y = parentSize.height - (this._topMargin + (1 - ownerAnchor.y) * ownerSize.height);
                 break;
             case ccui.LayoutComponent.verticalEdge.CENTER:
-                if (this._usingPercentHeight || this._usingStretchHeight) {
+                if(this._isPercentOnly)
+                    break;
+                if (this._usingStretchHeight) {
                     ownerSize.height = parentSize.height - this._topMargin - this._bottomMargin;
                     if (ownerSize.height < 0)
                         ownerSize.height = 0;
                     ownerPosition.y = this._bottomMargin + ownerAnchor.y * ownerSize.height;
-                } else
+                } else {
+                    if(this._usingPercentHeight)
+                        ownerSize.height = parentSize.height * this._percentHeight;
                     ownerPosition.y = parentSize.height * this._positionPercentY;
+                }
                 break;
             default:
                 break;
diff --git a/extensions/ccui/uiwidgets/UIButton.js b/extensions/ccui/uiwidgets/UIButton.js
@@ -185,6 +185,10 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
         this.setCapInsetsPressedRenderer(this._capInsetsPressed);
         this.setCapInsetsDisabledRenderer(this._capInsetsDisabled);
         this.setBright(this._bright);
+
+        this._normalTextureAdaptDirty = true;
+        this._pressedTextureAdaptDirty = true;
+        this._disabledTextureAdaptDirty = true;
     },
 
     /**
@@ -506,33 +510,31 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
             if (this.pressedActionEnabled){
                 this._buttonNormalRenderer.stopAllActions();
                 this._buttonClickedRenderer.stopAllActions();
-                var zoomAction = cc.scaleTo(ccui.Button.ZOOM_ACTION_TIME_STEP, this._normalTextureScaleXInSize, this._normalTextureScaleYInSize);
-                this._buttonNormalRenderer.runAction(zoomAction);
+                //var zoomAction = cc.scaleTo(ccui.Button.ZOOM_ACTION_TIME_STEP, this._normalTextureScaleXInSize, this._normalTextureScaleYInSize);
+                //fixme: the zoomAction will run in the next frame which will cause the _buttonNormalRenderer to a wrong scale
+                //this._buttonNormalRenderer.runAction(zoomAction);
+                this._buttonNormalRenderer.setScale(this._normalTextureScaleXInSize, this._normalTextureScaleYInSize);
                 this._buttonClickedRenderer.setScale(this._pressedTextureScaleXInSize, this._pressedTextureScaleYInSize);
 
                 this._titleRenderer.stopAllActions();
                 if (this._unifySize){
                     var zoomTitleAction = cc.scaleTo(ccui.Button.ZOOM_ACTION_TIME_STEP, 1, 1);
                     this._titleRenderer.runAction(zoomTitleAction);
-                }else
-                    this._titleRenderer.runAction(zoomAction.clone());
+                }else{
+                    this._titleRenderer.setScaleX(1);
+                    this._titleRenderer.setScaleY(1);
+                }
             }
         } else {
             this._buttonNormalRenderer.stopAllActions();
             this._buttonNormalRenderer.setScale(this._normalTextureScaleXInSize, this._normalTextureScaleYInSize);
 
             this._titleRenderer.stopAllActions();
-
             if (this._scale9Enabled)
                 this._buttonNormalRenderer.setColor(cc.color.WHITE);
 
-            if(this._unifySize){
-                this._titleRenderer.setScaleX(1);
-                this._titleRenderer.setScaleY(1);
-            }else{
-                this._titleRenderer.setScaleX(this._normalTextureScaleXInSize);
-                this._titleRenderer.setScaleY(this._normalTextureScaleYInSize);
-            }
+            this._titleRenderer.setScaleX(1);
+            this._titleRenderer.setScaleY(1);
         }
     },
 
@@ -554,11 +556,7 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
                 locNormalRenderer.setScale(this._pressedTextureScaleXInSize + this._zoomScale, this._pressedTextureScaleYInSize + this._zoomScale);
 
                 this._titleRenderer.stopAllActions();
-                if (this._unifySize){
-                    var zoomTitleAction = cc.scaleTo(ccui.Button.ZOOM_ACTION_TIME_STEP, 1 + this._zoomScale, 1 + this._zoomScale);
-                    this._titleRenderer.runAction(zoomTitleAction);
-                } else
-                    this._titleRenderer.runAction(zoomAction.clone());
+                this._titleRenderer.runAction(cc.scaleTo(ccui.Button.ZOOM_ACTION_TIME_STEP, 1 + this._zoomScale, 1 + this._zoomScale));
             }
         } else {
             locNormalRenderer.setVisible(true);
@@ -567,17 +565,9 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
             locNormalRenderer.stopAllActions();
             locNormalRenderer.setScale(this._normalTextureScaleXInSize + this._zoomScale, this._normalTextureScaleYInSize + this._zoomScale);
 
-            if (this._scale9Enabled)
-                locNormalRenderer.setState(ccui.Scale9Sprite.state.GRAY);
-
             this._titleRenderer.stopAllActions();
-            if (this._unifySize){
-                this._titleRenderer.setScaleX(1 + this._zoomScale);
-                this._titleRenderer.setScaleY(1 + this._zoomScale);
-            }else{
-                this._titleRenderer.setScaleX(this._normalTextureScaleXInSize + this._zoomScale);
-                this._titleRenderer.setScaleY(this._normalTextureScaleYInSize + this._zoomScale);
-            }
+            this._titleRenderer.setScaleX(1 + this._zoomScale);
+            this._titleRenderer.setScaleY(1 + this._zoomScale);
         }
     },
 
@@ -831,6 +821,15 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
         return this._zoomScale;
     },
 
+    /**
+     * Returns the normalize of texture size
+     * @since v3.3
+     * @returns {cc.Size}
+     */
+    getNormalTextureSize: function(){
+        return this._normalTextureSize;
+    },
+
     /**
      * Sets title fontName to ccui.Button.
      * @param {String} fontName
diff --git a/extensions/ccui/uiwidgets/UIImageView.js b/extensions/ccui/uiwidgets/UIImageView.js
@@ -174,6 +174,7 @@ ccui.ImageView = ccui.Widget.extend(/** @lends ccui.ImageView# */{
         } else
             this.ignoreContentAdaptWithSize(this._prevIgnoreSize);
         this.setCapInsets(this._capInsets);
+        this._imageRendererAdaptDirty = true;
     },
 
     /**
@@ -256,10 +257,11 @@ ccui.ImageView = ccui.Widget.extend(/** @lends ccui.ImageView# */{
             if (!this._scale9Enabled)
                 this._imageRenderer.setScale(1.0);
         } else {
-            if (this._scale9Enabled)
+            if (this._scale9Enabled){
                 this._imageRenderer.setPreferredSize(this._contentSize);
-            else {
-                var textureSize = this._imageRenderer.getContentSize();
+                this._imageRenderer.setScale(1);
+            } else {
+                var textureSize = this._imageTextureSize;
                 if (textureSize.width <= 0.0 || textureSize.height <= 0.0) {
                     this._imageRenderer.setScale(1.0);
                     return;
diff --git a/extensions/ccui/uiwidgets/UILoadingBar.js b/extensions/ccui/uiwidgets/UILoadingBar.js
@@ -188,6 +188,7 @@ ccui.LoadingBar = ccui.Widget.extend(/** @lends ccui.LoadingBar# */{
             this.ignoreContentAdaptWithSize(this._prevIgnoreSize);
         this.setCapInsets(this._capInsets);
         this.setPercent(this._percent);
+        this._barRendererAdaptDirty = true;
     },
 
     /**
@@ -328,9 +329,10 @@ ccui.LoadingBar = ccui.Widget.extend(/** @lends ccui.LoadingBar# */{
             }
         } else {
             this._totalLength = locContentSize.width;
-            if (this._scale9Enabled)
+            if (this._scale9Enabled){
                 this._setScale9Scale();
-            else {
+                locBarRender.setScale(1.0);
+            } else {
                 var textureSize = this._barRendererTextureSize;
                 if (textureSize.width <= 0.0 || textureSize.height <= 0.0) {
                     locBarRender.setScale(1.0);
diff --git a/extensions/ccui/uiwidgets/UISlider.js b/extensions/ccui/uiwidgets/UISlider.js
@@ -33,6 +33,7 @@
 ccui.Slider = ccui.Widget.extend(/** @lends ccui.Slider# */{
     _barRenderer: null,
     _progressBarRenderer: null,
+    _barTextureSize: null,
     _progressBarTextureSize: null,
     _slidBallNormalRenderer: null,
     _slidBallPressedRenderer: null,
@@ -74,6 +75,7 @@ ccui.Slider = ccui.Widget.extend(/** @lends ccui.Slider# */{
      * var uiSlider = new ccui.Slider();
      */
     ctor: function (barTextureName, normalBallTextureName, resType) {
+        this._barTextureSize = cc.size(0,0);
         this._progressBarTextureSize = cc.size(0, 0);
         this._capInsetsBarRenderer = cc.rect(0, 0, 0, 0);
         this._capInsetsProgressBarRenderer = cc.rect(0, 0, 0, 0);
@@ -155,6 +157,7 @@ ccui.Slider = ccui.Widget.extend(/** @lends ccui.Slider# */{
         this._progressBarRendererDirty = true;
         this._updateContentSizeWithTextureSize(this._barRenderer.getContentSize());
         this._findLayout();
+        this._barTextureSize = this._barRenderer.getContentSize();
     },
 
     /**
@@ -233,6 +236,8 @@ ccui.Slider = ccui.Widget.extend(/** @lends ccui.Slider# */{
         }
         this.setCapInsetsBarRenderer(this._capInsetsBarRenderer);
         this.setCapInsetProgressBarRenderer(this._capInsetsProgressBarRenderer);
+        this._barRendererAdaptDirty = true;
+        this._progressBarRendererDirty = true;
     },
 
     /**
@@ -448,7 +453,7 @@ ccui.Slider = ccui.Widget.extend(/** @lends ccui.Slider# */{
         var dis = this._barLength * res;
         this._slidBallRenderer.setPosition(dis, this._contentSize.height / 2);
         if (this._scale9Enabled)
-            this._progressBarRenderer.setPreferredSize(cc.size(dis, this._progressBarTextureSize.height));
+            this._progressBarRenderer.setPreferredSize(cc.size(dis, this._contentSize.height));
         else {
             var spriteRenderer = this._progressBarRenderer;
             var rect = spriteRenderer.getTextureRect();
@@ -595,9 +600,9 @@ ccui.Slider = ccui.Widget.extend(/** @lends ccui.Slider# */{
             this._barLength = this._contentSize.width;
             if (this._scale9Enabled) {
                 this._barRenderer.setPreferredSize(this._contentSize);
-            }
-            else {
-                var btextureSize = this._barRenderer.getContentSize();
+                this._barRenderer.setScale(1.0);
+            } else {
+                var btextureSize = this._barTextureSize;
                 if (btextureSize.width <= 0.0 || btextureSize.height <= 0.0) {
                     this._barRenderer.setScale(1.0);
                     return;
@@ -627,7 +632,7 @@ ccui.Slider = ccui.Widget.extend(/** @lends ccui.Slider# */{
         else {
             if (this._scale9Enabled) {
                 this._progressBarRenderer.setPreferredSize(this._contentSize);
-                this._progressBarTextureSize = this._progressBarRenderer.getContentSize();
+                this._progressBarRenderer.setScale(1);
             }
             else {
                 var ptextureSize = this._progressBarTextureSize;
diff --git a/extensions/ccui/uiwidgets/UIText.js b/extensions/ccui/uiwidgets/UIText.js
@@ -23,7 +23,6 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-
 /**
  * The text control of Cocos UI.
  * @class
@@ -85,9 +84,9 @@ ccui.Text = ccui.Widget.extend(/** @lends ccui.Text# */{
     init: function (textContent, fontName, fontSize) {
         if (ccui.Widget.prototype.init.call(this)) {
             if(arguments.length > 0){
-                this.setString(textContent);
                 this.setFontName(fontName);
                 this.setFontSize(fontSize);
+                this.setString(textContent);
             }
             return true;
         }
@@ -325,6 +324,17 @@ ccui.Text = ccui.Widget.extend(/** @lends ccui.Text# */{
         return this._labelRenderer;
     },
 
+    //@since v3.3
+    getAutoRenderSize: function(){
+        var virtualSize = this._labelRenderer.getContentSize();
+        if (!this._ignoreSize) {
+            this._labelRenderer.setDimensions(0, 0);
+            virtualSize = this._labelRenderer.getContentSize();
+            this._labelRenderer.setDimensions(this._contentSize.width, this._contentSize.height);
+        }
+        return virtualSize;
+    },
+
     _labelScaleChangedWithSize: function () {
         var locContentSize = this._contentSize;
         if (this._ignoreSize) {
diff --git a/extensions/ccui/uiwidgets/UITextBMFont.js b/extensions/ccui/uiwidgets/UITextBMFont.js
@@ -68,13 +68,14 @@ ccui.LabelBMFont = ccui.TextBMFont = ccui.Widget.extend(/** @lends ccui.TextBMFo
     setFntFile: function (fileName) {
         if (!fileName)
             return;
+        this._fntFileName = fileName;
 
-        var _self = this;
-        _self._fntFileName = fileName;
-
-        _self._fntFileHasInit = true;
-        _self._labelBMFontRenderer.initWithString(this._stringValue, fileName);
+        this._fntFileHasInit = true;
+        this._labelBMFontRenderer.initWithString(this._stringValue, fileName);
+        this._updateContentSizeWithTextureSize(this._labelBMFontRenderer.getContentSize());
+        this._labelBMFontRendererAdaptDirty = true;
 
+        var _self = this;
         var locRenderer = _self._labelBMFontRenderer;
         if(!locRenderer._textureLoaded){
              locRenderer.addEventListener("load", function(){
@@ -101,9 +102,9 @@ ccui.LabelBMFont = ccui.TextBMFont = ccui.Widget.extend(/** @lends ccui.TextBMFo
         if(value == this._labelBMFontRenderer.getString())
             return;
         this._stringValue = value;
+        this._labelBMFontRenderer.setString(value);
         if (!this._fntFileHasInit)
             return;
-        this._labelBMFontRenderer.setString(value);
         this._updateContentSizeWithTextureSize(this._labelBMFontRenderer.getContentSize());
         this._labelBMFontRendererAdaptDirty = true;
     },
diff --git a/extensions/ccui/uiwidgets/UITextField.js b/extensions/ccui/uiwidgets/UITextField.js
diff --git a/extensions/ccui/uiwidgets/scroll-widget/UIListView.js b/extensions/ccui/uiwidgets/scroll-widget/UIListView.js
