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

Merge pull request #13478 from xiaofeng11/v3.8 

Fix Cocos Studio Bugs
This commit is contained in:
pandamicro 2015-08-20 14:42:36 +08:00
parent fc763e9732 6bdb5431f1
commit 13a271d96d
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/editor-support/cocostudio/CCBone.cpp
View File

@ -257,13 +257,17 @@ void Bone::setBlendFunc(const BlendFunc& blendFunc)
void Bone::updateDisplayedColor(const Color3B &parentColor)
{
#ifdef CC_STUDIO_ENABLED_VIEW
_realColor = Color3B(255, 255, 255);
#endif // CC_STUDIO_ENABLED_VIEW
Node::updateDisplayedColor(parentColor);
}
void Bone::updateDisplayedOpacity(GLubyte parentOpacity)
{
#ifdef CC_STUDIO_ENABLED_VIEW
_realOpacity = 255;
#endif // CC_STUDIO_ENABLED_VIEW
Node::updateDisplayedOpacity(parentOpacity);
}

18
cocos/editor-support/cocostudio/CCSGUIReader.cpp
View File

@ -764,7 +764,11 @@ void WidgetPropertiesReader0250::setPropsForButtonFromJsonDictionary(Widget*widg
bool fn = DICTOOL->checkObjectExist_json(options, "fontName");
if (fn)
{
button->setTitleFontName(DICTOOL->getStringValue_json(options, "fontName"));
const char * szTemp = DICTOOL->getStringValue_json(options, "fontName");
if (szTemp && *szTemp)
button->setTitleFontName(szTemp);
else
button->setTitleFontName(std::string(""));
}
setColorPropsForWidgetFromJsonDictionary(widget,options);
}
@ -882,7 +886,11 @@ void WidgetPropertiesReader0250::setPropsForLabelFromJsonDictionary(Widget*widge
bool fn = DICTOOL->checkObjectExist_json(options, "fontName");
if (fn)
{
label->setFontName(DICTOOL->getStringValue_json(options, "fontName"));
const char * szTemp = DICTOOL->getStringValue_json(options, "fontName");
if (szTemp && *szTemp)
label->setFontName(szTemp);
else
label->setFontName(std::string(""));
}
bool aw = DICTOOL->checkObjectExist_json(options, "areaWidth");
bool ah = DICTOOL->checkObjectExist_json(options, "areaHeight");
@ -1105,7 +1113,11 @@ void WidgetPropertiesReader0250::setPropsForTextFieldFromJsonDictionary(Widget*w
bool fn = DICTOOL->checkObjectExist_json(options, "fontName");
if (fn)
{
textField->setFontName(DICTOOL->getStringValue_json(options, "fontName"));
const char * szTemp = DICTOOL->getStringValue_json(options, "fontName");
if (szTemp && *szTemp)
textField->setFontName(szTemp);
else
textField->setFontName(std::string(""));
}
bool tsw = DICTOOL->checkObjectExist_json(options, "touchSizeWidth");
bool tsh = DICTOOL->checkObjectExist_json(options, "touchSizeHeight");