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

Merge pull request #7622 from rny/LabelTTF 

fix LabelTTF::getBoundingBox() position error
This commit is contained in:
minggo 2014-08-06 14:33:28 +08:00
parent 6885f997e9 d53cdc39df
commit 6ee0c4171f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/2d/CCLabelTTF.cpp
View File

@ -280,7 +280,8 @@ const Size& LabelTTF::getContentSize() const
Rect LabelTTF::getBoundingBox() const
{
return _renderLabel->getBoundingBox();
const_cast<LabelTTF*>(this)->setContentSize(_renderLabel->getContentSize());
return Node::getBoundingBox();
}
#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))