Skip to content

Closed #5157: Fix - LabelAtlas use setString will clear everything in ca... #1846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2014
Merged

Closed #5157: Fix - LabelAtlas use setString will clear everything in ca... #1846

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions cocos2d/labels/CCLabelAtlas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,11 @@ cc.LabelAtlas = cc.AtlasNode.extend(/** @lends cc.LabelAtlas# */{
}
},

_addChildForCanvas: function(child, zOrder, tag){
child._lateChild = true;
cc.NodeRGBA.prototype.addChild.call(this, child, zOrder, tag);
},

/**
* @function
* Atlas generation
Expand Down Expand Up @@ -210,7 +215,7 @@ cc.LabelAtlas = cc.AtlasNode.extend(/** @lends cc.LabelAtlas# */{
} else
fontChar.initWithTexture(texture, rect);

this.addChild(fontChar, 0, i);
cc.NodeRGBA.prototype.addChild.call(this, fontChar, 0, i);
} else {
if (c == 32) {
fontChar.init();
Expand Down Expand Up @@ -319,7 +324,7 @@ cc.LabelAtlas = cc.AtlasNode.extend(/** @lends cc.LabelAtlas# */{
len = locChildren.length;
for (var i = 0; i < len; i++) {
var node = locChildren[i];
if (node)
if (node && !node._lateChild)
node.visible = false;
}
}
Expand Down Expand Up @@ -370,6 +375,7 @@ if (cc._renderType === cc._RENDER_TYPE_WEBGL) {
_p.updateAtlasValues = _p._updateAtlasValuesForCanvas;
_p.setString = _p._setStringForCanvas;
_p.setOpacity = _p._setOpacityForCanvas;
_p.addChild = _p._addChildForCanvas;
}

// Override properties
Expand Down