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

change setColor to setTextColor

This commit is contained in:
andyque 2014-12-25 16:04:28 +08:00
parent 6ec03010a7
commit 3f0f7c289f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/ui/UIButton.cpp
View File

@ -724,12 +724,12 @@ const std::string& Button::getTitleText() const
void Button::setTitleColor(const Color3B& color)
{
_titleRenderer->setColor(color);
_titleRenderer->setTextColor(Color4B(color));
}
const Color3B& Button::getTitleColor() const
Color3B Button::getTitleColor() const
{
return _titleRenderer->getColor();
return Color3B(_titleRenderer->getTextColor());
}
void Button::setTitleFontSize(float size)

2
cocos/ui/UIButton.h
View File

@ -189,7 +189,7 @@ public:
void setTitleText(const std::string& text);
const std::string& getTitleText() const;
void setTitleColor(const Color3B& color);
const Color3B& getTitleColor() const;
Color3B getTitleColor() const;
void setTitleFontSize(float size);
float getTitleFontSize() const;
void setTitleFontName(const std::string& fontName);