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

Label:Fixed the character positions could be wrong if `getLetter(letterIndex)` get called.

This commit is contained in:
WenhaiLin 2015-05-04 10:07:37 +08:00
parent 004cb5464e
commit 22c46b5c14
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos/2d/CCLabel.cpp
View File

@ -628,13 +628,15 @@ void Label::alignText()
letterSprite = dynamic_cast<Sprite*>(child); letterSprite = dynamic_cast<Sprite*>(child);
if (letterSprite) if (letterSprite)
{ {
uvRect.size.height = _lettersInfo[tag].def.height; auto& letterDef = _lettersInfo[tag].def;
uvRect.size.width = _lettersInfo[tag].def.width; uvRect.size.height = letterDef.height;
uvRect.origin.x = _lettersInfo[tag].def.U; uvRect.size.width = letterDef.width;
uvRect.origin.y = _lettersInfo[tag].def.V; uvRect.origin.x = letterDef.U;
uvRect.origin.y = letterDef.V;
letterSprite->setTexture(textures.at(_lettersInfo[tag].def.textureID)); letterSprite->setTexture(textures.at(letterDef.textureID));
letterSprite->setTextureRect(uvRect); letterSprite->setTextureRect(uvRect);
letterSprite->setPosition(_lettersInfo[tag].position);
} }
++index; ++index;
} }