diff --git a/cocos2d/core/label/CCSGLabel.js b/cocos2d/core/label/CCSGLabel.js index fff4f7df9a..1ad8178c1d 100644 --- a/cocos2d/core/label/CCSGLabel.js +++ b/cocos2d/core/label/CCSGLabel.js @@ -187,6 +187,7 @@ _ccsg.Label = _ccsg.Node.extend({ setHorizontalAlign: function(align) { if (this._hAlign === align) return; + this._hAlign = align; this._notifyLabelSkinDirty(); }, @@ -197,6 +198,7 @@ _ccsg.Label = _ccsg.Node.extend({ setVerticalAlign: function(align) { if (this._vAlign === align) return; + this._vAlign = align; this._notifyLabelSkinDirty(); }, @@ -212,11 +214,14 @@ _ccsg.Label = _ccsg.Node.extend({ } if (this._string === string) return; + this._string = string; this._notifyLabelSkinDirty(); }, setMargin: function(value) { + if(this._margin === value) return; + this._margin = value; this._notifyLabelSkinDirty(); }, @@ -230,6 +235,7 @@ _ccsg.Label = _ccsg.Node.extend({ enableWrapText: function(enabled) { if (this._isWrapText === enabled) return; + //when label is in resize mode, wrap is disabled. if (this._overFlow === _ccsg.Label.Overflow.RESIZE_HEIGHT || this._overFlow === _ccsg.Label.Overflow.NONE) { @@ -251,11 +257,15 @@ _ccsg.Label = _ccsg.Node.extend({ }, enableBold: function (enabled) { + if(this._isBold === enabled) return; + this._isBold = enabled; this._notifyLabelSkinDirty(); }, enableUnderline: function (enabled) { + if(this._isUnderline === enabled) return; + this._isUnderline = enabled; this._notifyLabelSkinDirty(); }, @@ -267,6 +277,8 @@ _ccsg.Label = _ccsg.Node.extend({ return this._fontHandle; }, setFontSize: function(fntSize) { + if(this._fontSize === fntSize) return; + this._fontSize = fntSize; this._drawFontsize = fntSize; this._notifyLabelSkinDirty(); @@ -281,6 +293,8 @@ _ccsg.Label = _ccsg.Node.extend({ }, setOutlined: function(value) { + if(this._outlined === value) return; + this._outlined = !!value; this._notifyLabelSkinDirty(); }, @@ -290,11 +304,15 @@ _ccsg.Label = _ccsg.Node.extend({ }, setOutlineColor: function(value) { + if(this._outlineColor === value) return; + this._outlineColor = cc.color(value); this._notifyLabelSkinDirty(); }, setOutlineWidth: function(value) { + if(this._outlineWidth === value) return; + this._outlineWidth = value; this._notifyLabelSkinDirty(); }, @@ -352,6 +370,7 @@ _ccsg.Label = _ccsg.Node.extend({ setLineHeight: function(lineHeight) { if (this._lineHeight === lineHeight) return; + this._lineHeight = lineHeight; this._notifyLabelSkinDirty(); },