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

fix edge case crash

This commit is contained in:
andyque 2015-04-14 15:34:15 +08:00
parent a2df0ca769
commit 240bf58bfc
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cocos/ui/UIButton.cpp
View File

@ -845,15 +845,22 @@ Label* Button::getTitleRenderer()const
return _titleRenderer;
}
const std::string& Button::getTitleFontName() const
const std::string Button::getTitleFontName() const
{
if(this->_type == FontType::SYSTEM)
if (nullptr != _titleRenderer)
{
return _titleRenderer->getSystemFontName();
if(this->_type == FontType::SYSTEM)
{
return _titleRenderer->getSystemFontName();
}
else
{
return _titleRenderer->getTTFConfig().fontFilePath;
}
}
else
{
return _titleRenderer->getTTFConfig().fontFilePath;
return "";
}
}
@ -874,9 +881,21 @@ void Button::copySpecialProperties(Widget *widget)
{
_prevIgnoreSize = button->_prevIgnoreSize;
setScale9Enabled(button->_scale9Enabled);
loadTextureNormal(button->_buttonNormalRenderer->getSprite()->getSpriteFrame());
loadTexturePressed(button->_buttonClickedRenderer->getSprite()->getSpriteFrame());
loadTextureDisabled(button->_buttonDisableRenderer->getSprite()->getSpriteFrame());
auto normalSprite = button->_buttonNormalRenderer->getSprite();
if (nullptr != normalSprite)
{
loadTextureNormal(normalSprite->getSpriteFrame());
}
auto clickedSprite = button->_buttonClickedRenderer->getSprite();
if (nullptr != clickedSprite)
{
loadTexturePressed(clickedSprite->getSpriteFrame());
}
auto disabledSprite = button->_buttonDisableRenderer->getSprite();
if (nullptr != disabledSprite)
{
loadTextureDisabled(disabledSprite->getSpriteFrame());
}
setCapInsetsNormalRenderer(button->_capInsetsNormal);
setCapInsetsPressedRenderer(button->_capInsetsPressed);
setCapInsetsDisabledRenderer(button->_capInsetsDisabled);

2
cocos/ui/UIButton.h
View File

@ -245,7 +245,7 @@ public:
* Query the font name of button's title
*@return font name in std::string
*/
const std::string& getTitleFontName() const;
const std::string getTitleFontName() const;
/** @brief When user pressed the button, the button will zoom to a scale.
* The final scale of the button equals (button original scale + _zoomScale)