Fix issues in cocos2d#3407

Author: pandamicro

Diff for: cocos2d/core/labelttf/CCLabelTTF.js

@@ -610,9 +610,9 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
      * @param {Number} [scaleY=]
      */
     setScale: function (scale, scaleY) {
-        this._scaleX = scale / cc.view.getDevicePixelRatio();
-        this._scaleY = ((scaleY || scaleY === 0) ? scaleY : scale) /
-          cc.view.getDevicePixelRatio();
+        var ratio = cc.view.getDevicePixelRatio();
+        this._scaleX = scale / ratio;
+        this._scaleY = ((scaleY || scaleY === 0) ? scaleY : scale) / ratio;
         this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.transformDirty);
     },
 
@@ -806,25 +806,37 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
     getContentSize: function () {
         if (this._needUpdateTexture)
             this._renderCmd._updateTTF();
-        return cc.size(
-            this._contentSize.width / cc.view.getDevicePixelRatio(),
-            this._contentSize.height / cc.view.getDevicePixelRatio());
+        var ratio = cc.view.getDevicePixelRatio();
+        return cc.size( this._contentSize.width / ratio, this._contentSize.height / ratio );
     },
 
     _getWidth: function () {
         if (this._needUpdateTexture)
             this._renderCmd._updateTTF();
-        return cc.Sprite.prototype._getWidth.call(this);
+        return this._contentSize.width / cc.view.getDevicePixelRatio();
     },
     _getHeight: function () {
         if (this._needUpdateTexture)
             this._renderCmd._updateTTF();
-        return cc.Sprite.prototype._getHeight.call(this);
+        return this._contentSize.height / cc.view.getDevicePixelRatio();
     },
 
     setTextureRect: function (rect, rotated, untrimmedSize) {
-        //set needConvert to false
-        cc.Sprite.prototype.setTextureRect.call(this, rect, rotated, untrimmedSize, false);
+        var _t = this;
+        _t._rectRotated = rotated || false;
+        _t.setContentSize(untrimmedSize || rect);
+
+        _t.setVertexRect(rect);
+        _t._renderCmd._setTextureCoords(rect, false);
+
+        var relativeOffsetX = _t._unflippedOffsetPositionFromCenter.x, relativeOffsetY = _t._unflippedOffsetPositionFromCenter.y;
+        if (_t._flippedX)
+            relativeOffsetX = -relativeOffsetX;
+        if (_t._flippedY)
+            relativeOffsetY = -relativeOffsetY;
+        var locRect = _t._rect;
+        _t._offsetPosition.x = relativeOffsetX + (rect.width - locRect.width) / 2;
+        _t._offsetPosition.y = relativeOffsetY + (rect.height - locRect.height) / 2;
     },
 
     /**

Diff for: cocos2d/core/labelttf/CCLabelTTFCanvasRenderCmd.js

@@ -103,7 +103,8 @@ cc.LabelTTF._firsrEnglish = /^[a-zA-Z0-9ÄÖÜäöüßéèçàùêâîôû]/;
 
     proto._updateTTF = function () {
         var node = this._node;
-        var locDimensionsWidth = node._dimensions.width, i, strLength;
+        var pixelRatio = cc.view.getDevicePixelRatio();
+        var locDimensionsWidth = node._dimensions.width * pixelRatio, i, strLength;
         var locLineWidth = this._lineWidths;
         locLineWidth.length = 0;
 
@@ -135,7 +136,6 @@ cc.LabelTTF._firsrEnglish = /^[a-zA-Z0-9ÄÖÜäöüßéèçàùêâîôû]/;
             locStrokeShadowOffsetY += Math.abs(locOffsetSize.y) * 2;
         }
 
-        var pixelRatio = cc.view.getDevicePixelRatio();
         //get offset for stroke and shadow
         if (locDimensionsWidth === 0) {
             if (this._isMultiLine)
@@ -178,6 +178,7 @@ cc.LabelTTF._firsrEnglish = /^[a-zA-Z0-9ÄÖÜäöüßéèçàùêâîôû]/;
 
     proto._saveStatus = function () {
         var node = this._node;
+        var scale = cc.view.getDevicePixelRatio();
         var locStrokeShadowOffsetX = node._strokeShadowOffsetX, locStrokeShadowOffsetY = node._strokeShadowOffsetY;
         var locContentSizeHeight = node._contentSize.height - locStrokeShadowOffsetY, locVAlignment = node._vAlignment,
             locHAlignment = node._hAlignment;
@@ -310,32 +311,16 @@ cc.LabelTTF._firsrEnglish = /^[a-zA-Z0-9ÄÖÜäöüßéèçàùêâîôû]/;
 
     proto.updateStatus = function () {
         var flags = cc.Node._dirtyFlags, locFlag = this._dirtyFlag;
-
-<<<<<<< HEAD
-=======
-        cc.Node.RenderCmd.prototype.updateStatus.call(this);
 
->>>>>>> 45cdfaa... Revert "Fix UIText issue and Label getContentSize value wrong in retina mode"
         if (locFlag & flags.textDirty)
             this._updateTexture();
 
         cc.Node.RenderCmd.prototype.updateStatus.call(this);
-
-        if (this._dirtyFlag & flags.transformDirty){
-            this.transform(this.getParentRenderCmd(), true);
-            this._dirtyFlag = this._dirtyFlag & cc.Node._dirtyFlags.transformDirty ^ this._dirtyFlag;
-        }
     };
 
     proto._syncStatus = function (parentCmd) {
         var flags = cc.Node._dirtyFlags, locFlag = this._dirtyFlag;
-<<<<<<< HEAD
 
-=======
-        
-        cc.Node.RenderCmd.prototype._syncStatus.call(this, parentCmd);
-        
->>>>>>> 45cdfaa... Revert "Fix UIText issue and Label getContentSize value wrong in retina mode"
         if (locFlag & flags.textDirty)
             this._updateTexture();
 

Diff for: extensions/ccui/uiwidgets/UIText.js

@@ -46,7 +46,7 @@ ccui.Text = ccui.Widget.extend(/** @lends ccui.Text# */{
     _fontName: "Arial",
     _fontSize: 16,
     _onSelectedScaleOffset:0.5,
-    _labelRenderer: "",
+    _labelRenderer: null,
     _textAreaSize: null,
     _textVerticalAlignment: 0,
     _textHorizontalAlignment: 0,