Merge pull request cocos2d#1462 from dingpinglv/DevelopToMaster

tag Cocos2d-html5 v2.2.2

Author: dingpinglv

cocos2d/core/labelTTF/CCLabelTTF.js

@@ -729,28 +729,25 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
     },
 
     _updateTTF: function () {
-        var locDimensionsWidth = this._dimensions.width;
+        var locDimensionsWidth = this._dimensions.width, i, strLength;
         this._lineWidths = [];
 
-        this._isMultiLine = false;
+        this._isMultiLine = false ;
+        this._measureConfig();
         if (locDimensionsWidth !== 0) {
             // Content processing
-            this._measureConfig();
             var text = this._string;
-
             this._strings = [];
-            for (var i = 0, length = this._string.length; i < length;) {
+            for (i = 0, strLength = this._string.length; i < strLength;) {
                 // Find the index of next line
                 var next = this._checkNextline(text.substr(i), locDimensionsWidth);
                 var append = text.substr(i, next);
-
                 this._strings.push(append);
                 i += next;
             }
-        }
-        else {
+        } else {
             this._strings = this._string.split('\n');
-            for (var i = 0, length = this._strings.length; i < length; i++) {
+            for (i = 0, strLength = this._strings.length; i < strLength; i++) {
                 this._lineWidths.push(this._measure(this._strings[i]));
             }
         }

cocos2d/core/platform/CCEGLView.js

@@ -435,7 +435,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.EGLView# */{
         }
         this.setResolutionPolicy(resolutionPolicy);
         if (policy = this._resolutionPolicy)
-            policy.init(this);
+            policy.preApply(this);
         else {
             cc.log("should set resolutionPolicy");
             return;
@@ -460,12 +460,11 @@ cc.EGLView = cc.Class.extend(/** @lends cc.EGLView# */{
             this._scaleY = result.scale[1];
         }
         if (result.viewport instanceof cc.Rect) {
-            var vp = this._viewPortRect = result.viewport, visible = this._visibleRect,
-                designW = this._designResolutionSize.width, designH = this._designResolutionSize.height;
-            visible._size.width = Math.min(vp.width / this._scaleX, designW);
-            visible._size.height = Math.min(vp.height / this._scaleY, designH);
-            visible._origin.x = (designW - visible._size.width) / 2;
-            visible._origin.y = (designH - visible._size.height) / 2;
+            var vp = this._viewPortRect = result.viewport, visible = this._visibleRect;
+            visible._size.width = cc.canvas.width / this._scaleX;
+            visible._size.height = cc.canvas.height / this._scaleY;
+            visible._origin.x = -vp.x / this._scaleX;
+            visible._origin.y = -vp.y / this._scaleY;
         }
 
         // reset director's member variables to fit visible rect
@@ -486,6 +485,8 @@ cc.EGLView = cc.Class.extend(/** @lends cc.EGLView# */{
         }
 
         cc.VisibleRect.init(this.getVisibleSize());
+
+        policy.postApply(this);
     },
 
     /**
@@ -842,10 +843,10 @@ cc.EGLView.getInstance = function () {
 
 cc.ContainerStrategy = cc.Class.extend({
     /**
-     * Function to init the strategy
+     * Manipulation before appling the strategy
      * @param {cc.EGLView} The target view
      */
-    init: function (view) {
+    preApply: function (view) {
     },
 
     /**
@@ -856,6 +857,13 @@ cc.ContainerStrategy = cc.Class.extend({
     apply: function (view, designedResolution) {
     },
 
+    /**
+     * Manipulation after appling the strategy
+     * @param {cc.EGLView} The target view
+     */
+    postApply: function (view) {
+    },
+
     _setupContainer: function (frame, w, h) {
         if (cc.Browser.isMobile && frame == document.documentElement) {
             // Automatically full screen when user touches on mobile version
@@ -905,7 +913,7 @@ cc.ContainerStrategy = cc.Class.extend({
 });
 
 /**
- * <p>cc.ContainerStrategy class is the root strategy class of content's scale strategy,
+ * <p>cc.ContentStrategy class is the root strategy class of content's scale strategy,
  * it controls the behavior of how to scale the scene and setup the viewport for the game</p>
  *
  * @class
@@ -920,7 +928,9 @@ cc.ContentStrategy = cc.Class.extend({
     },
 
     _buildResult: function (containerW, containerH, contentW, contentH, scaleX, scaleY) {
-        var viewport = cc.rect((containerW - contentW) / 2, (containerH - contentH) / 2, containerW, containerH);
+        var viewport = cc.rect(Math.round((containerW - contentW) / 2),
+            Math.round((containerH - contentH) / 2),
+            contentW, contentH);
 
         // Translate the content
         if (cc.renderContextType == cc.CANVAS)
@@ -932,10 +942,10 @@ cc.ContentStrategy = cc.Class.extend({
     },
 
     /**
-     * Function to init the strategy
+     * Manipulation before appling the strategy
      * @param {cc.EGLView} The target view
      */
-    init: function (view) {
+    preApply: function (view) {
     },
 
     /**
@@ -948,6 +958,13 @@ cc.ContentStrategy = cc.Class.extend({
      */
     apply: function (view, designedResolution) {
         return {"scale": [1, 1]};
+    },
+
+    /**
+     * Manipulation after appling the strategy
+     * @param {cc.EGLView} The target view
+     */
+    postApply: function (view) {
     }
 });
 
@@ -985,7 +1002,7 @@ cc.ContentStrategy = cc.Class.extend({
     });
 
     var EqualToWindow = EqualToFrame.extend({
-        init: function (view) {
+        preApply: function (view) {
             view._frame = document.documentElement;
         },
 
@@ -997,7 +1014,7 @@ cc.ContentStrategy = cc.Class.extend({
     });
 
     var ProportionalToWindow = ProportionalToFrame.extend({
-        init: function (view) {
+        preApply: function (view) {
             view._frame = document.documentElement;
         },
 
@@ -1062,22 +1079,28 @@ cc.ContentStrategy = cc.Class.extend({
     var FixedHeight = cc.ContentStrategy.extend({
         apply: function (view, designedResolution) {
             var containerW = cc.canvas.width, containerH = cc.canvas.height,
-                designW = designedResolution.width, designH = designedResolution.height,
-                scale = containerH / designH,
-                contentW = designW * scale, contentH = containerH;
+                designH = designedResolution.height, scale = containerH / designH,
+                contentW = containerW, contentH = containerH;
 
             return this._buildResult(containerW, containerH, contentW, contentH, scale, scale);
+        },
+
+        postApply: function (view) {
+            cc.Director.getInstance()._winSizeInPoints = view.getVisibleSize();
         }
     });
 
     var FixedWidth = cc.ContentStrategy.extend({
         apply: function (view, designedResolution) {
             var containerW = cc.canvas.width, containerH = cc.canvas.height,
-                designW = designedResolution.width, designH = designedResolution.height,
-                scale = containerW / designW,
-                contentW = containerW, contentH = designH * scale;
+                designW = designedResolution.width, scale = containerW / designW,
+                contentW = containerW, contentH = containerH;
 
             return this._buildResult(containerW, containerH, contentW, contentH, scale, scale);
+        },
+
+        postApply: function (view) {
+            cc.Director.getInstance()._winSizeInPoints = view.getVisibleSize();
         }
     });
 
@@ -1111,12 +1134,12 @@ cc.ResolutionPolicy = cc.Class.extend({
     },
 
     /**
-     * Function to init the resolution policy
+     * Manipulation before appling the resolution policy
      * @param {cc.EGLView} The target view
      */
-    init: function (view) {
-        this._containerStrategy.init(view);
-        this._contentStrategy.init(view);
+    preApply: function (view) {
+        this._containerStrategy.preApply(view);
+        this._contentStrategy.preApply(view);
     },
 
     /**
@@ -1132,6 +1155,15 @@ cc.ResolutionPolicy = cc.Class.extend({
         return this._contentStrategy.apply(view, designedResolution);
     },
 
+    /**
+     * Manipulation after appling the strategy
+     * @param {cc.EGLView} The target view
+     */
+    postApply: function (view) {
+        this._containerStrategy.postApply(view);
+        this._contentStrategy.postApply(view);
+    },
+
     /**
      * Setup the container's scale strategy
      * @param {cc.ContainerStrategy} containerStg