Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3-label-pos' of https://github.com/WenhaiLin/cocos2d-x into v3.7

This commit is contained in:
WenhaiLin 2015-05-07 11:31:59 +08:00
parent f76dd57bf7 d09bd21da4
commit 03a1167902
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cocos/2d/CCLabel.cpp
View File

@ -621,7 +621,7 @@ void Label::alignText()
int tag = child->getTag();
if (tag >= strLen)
{
SpriteBatchNode::removeChild(child, true);
child->removeFromParentAndCleanup(true);
}
else if (tag >= 0)
{
@ -633,10 +633,11 @@ void Label::alignText()
uvRect.size.width = letterDef.width;
uvRect.origin.x = letterDef.U;
uvRect.origin.y = letterDef.V;
letterSprite->setTexture(textures.at(letterDef.textureID));
letterSprite->setTextureRect(uvRect);
letterSprite->setPosition(_lettersInfo[tag].position);
letterSprite->setBatchNode(_batchNodes[letterDef.textureID]);
letterSprite->setTextureRect(uvRect, false, uvRect.size);
letterSprite->setPosition(_lettersInfo[tag].position.x + letterDef.width/2,
_lettersInfo[tag].position.y - letterDef.height/2);
}
++index;
}
@ -966,8 +967,7 @@ void Label::onDraw(const Mat4& transform, bool transformUpdated)
for(const auto &child: _children)
{
if(child->getTag() >= 0)
child->updateTransform();
child->updateTransform();
}
for (const auto& batchNode:_batchNodes)