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

Merge pull request #1183 from minggo/iss1430_label 

compute correct label's width or height when its value is 0
This commit is contained in:
minggo 2012-08-15 20:47:02 -07:00
parent 67bda8cffa 416ce6b91d
commit f8c9ca5286
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cocos2dx/label_nodes/CCLabelTTF.cpp
View File

@ -221,7 +221,7 @@ CCSize CCLabelTTF::getDimensions()
return m_tDimensions;
}
void CCLabelTTF::setDimensions(CCSize &dim)
void CCLabelTTF::setDimensions(const CCSize &dim)
{
if (dim.width != m_tDimensions.width || dim.height != m_tDimensions.height)
{
@ -278,21 +278,16 @@ void CCLabelTTF::setFontName(const char *fontName)
void CCLabelTTF::updateTexture()
{
CCTexture2D *tex;
if (m_tDimensions.width == 0 || m_tDimensions.height == 0)
{
tex = new CCTexture2D();
tex->initWithString(m_string.c_str(), m_pFontName->c_str(), m_fFontSize * CC_CONTENT_SCALE_FACTOR()) ;
}
else
{
tex = new CCTexture2D();
tex->initWithString(m_string.c_str(),
CC_SIZE_POINTS_TO_PIXELS(m_tDimensions),
m_hAlignment,
m_vAlignment,
m_pFontName->c_str(),
m_fFontSize * CC_CONTENT_SCALE_FACTOR());
}
// let system compute label's width or height when its value is 0
// refer to cocos2d-x issue #1430
tex = new CCTexture2D();
tex->initWithString(m_string.c_str(),
CC_SIZE_POINTS_TO_PIXELS(m_tDimensions),
m_hAlignment,
m_vAlignment,
m_pFontName->c_str(),
m_fFontSize * CC_CONTENT_SCALE_FACTOR());
this->setTexture(tex);
tex->release();

2
cocos2dx/label_nodes/CCLabelTTF.h
View File

@ -119,7 +119,7 @@ public:
void setVerticalAlignment(CCVerticalTextAlignment verticalAlignment);
CCSize getDimensions();
void setDimensions(CCSize &dim);
void setDimensions(const CCSize &dim);
float getFontSize();
void setFontSize(float fontSize);