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

Merge branch 'fix_ccscale9sprite' of git://github.com/Clarinexus/cocos2d-x into Clarinexus-fix_cccontrolbutton

This commit is contained in:
James Chen 2013-05-13 16:24:59 +08:00
parent 68aa5318de f51506eed2
commit a8c95bc6f3
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
View File

@ -805,6 +805,11 @@ void CCScale9Sprite::setColor(const ccColor3B& color)
}
}
const ccColor3B& CCScale9Sprite::getColor()
{
return _color;
}
void CCScale9Sprite::setOpacity(GLubyte opacity)
{
_opacity = opacity;
@ -821,4 +826,9 @@ void CCScale9Sprite::setOpacity(GLubyte opacity)
}
}
GLubyte CCScale9Sprite::getOpacity()
{
return _opacity;
}
NS_CC_EXT_END

2
extensions/GUI/CCControlExtension/CCScale9Sprite.h
View File

@ -308,7 +308,9 @@ public:
*/
virtual bool isOpacityModifyRGB(void);
virtual void setOpacity(GLubyte opacity);
virtual GLubyte CCScale9Sprite::getOpacity();
virtual void setColor(const ccColor3B& color);
virtual const ccColor3B& CCScale9Sprite::getColor();
virtual bool updateWithBatchNode(CCSpriteBatchNode* batchnode, CCRect rect, bool rotated, CCRect capInsets);