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

Fix spelling of function name

This commit is contained in:
mogemimi 2015-11-06 17:36:24 +09:00
parent 4d9beb9d77
commit 689ee1081a
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/2d/CCFontAtlas.cpp
View File

@ -110,7 +110,7 @@ FontAtlas::~FontAtlas()
#endif #endif
_font->release(); _font->release();
relaseTextures(); releaseTextures();
delete []_currentPageData; delete []_currentPageData;
@ -123,7 +123,7 @@ FontAtlas::~FontAtlas()
#endif #endif
} }
void FontAtlas::relaseTextures() void FontAtlas::releaseTextures()
{ {
for( auto &item: _atlasTextures) for( auto &item: _atlasTextures)
{ {

2
cocos/2d/CCFontAtlas.h
View File

@ -109,7 +109,7 @@ public:
void setAliasTexParameters(); void setAliasTexParameters();
protected: protected:
void relaseTextures(); void releaseTextures();
void findNewCharacters(const std::u16string& u16Text, std::unordered_map<unsigned short, unsigned short>& charCodeMap); void findNewCharacters(const std::u16string& u16Text, std::unordered_map<unsigned short, unsigned short>& charCodeMap);

8
cocos/ui/UILayoutManager.cpp
View File

@ -203,7 +203,7 @@ Widget* RelativeLayoutManager::getRelativeWidget(Widget* widget)
return relativeWidget; return relativeWidget;
} }
bool RelativeLayoutManager::caculateFinalPositionWithRelativeWidget(LayoutProtocol *layout) bool RelativeLayoutManager::calculateFinalPositionWithRelativeWidget(LayoutProtocol *layout)
{ {
Vec2 ap = _widget->getAnchorPoint(); Vec2 ap = _widget->getAnchorPoint();
Size cs = _widget->getContentSize(); Size cs = _widget->getContentSize();
@ -426,7 +426,7 @@ bool RelativeLayoutManager::caculateFinalPositionWithRelativeWidget(LayoutProtoc
return true; return true;
} }
void RelativeLayoutManager::caculateFinalPositionWithRelativeAlign() void RelativeLayoutManager::calculateFinalPositionWithRelativeAlign()
{ {
RelativeLayoutParameter* layoutParameter = dynamic_cast<RelativeLayoutParameter*>(_widget->getLayoutParameter()); RelativeLayoutParameter* layoutParameter = dynamic_cast<RelativeLayoutParameter*>(_widget->getLayoutParameter());
@ -543,12 +543,12 @@ void RelativeLayoutManager::doLayout(LayoutProtocol *layout)
} }
bool ret = this->caculateFinalPositionWithRelativeWidget(layout); bool ret = this->calculateFinalPositionWithRelativeWidget(layout);
if (!ret) { if (!ret) {
continue; continue;
} }
this->caculateFinalPositionWithRelativeAlign(); this->calculateFinalPositionWithRelativeAlign();
_widget->setPosition(Vec2(_finalPositionX, _finalPositionY)); _widget->setPosition(Vec2(_finalPositionX, _finalPositionY));

4
cocos/ui/UILayoutManager.h
View File

@ -115,8 +115,8 @@ private:
Vector<Widget*> getAllWidgets(LayoutProtocol *layout); Vector<Widget*> getAllWidgets(LayoutProtocol *layout);
Widget* getRelativeWidget(Widget* widget); Widget* getRelativeWidget(Widget* widget);
bool caculateFinalPositionWithRelativeWidget(LayoutProtocol *layout); bool calculateFinalPositionWithRelativeWidget(LayoutProtocol *layout);
void caculateFinalPositionWithRelativeAlign(); void calculateFinalPositionWithRelativeAlign();
ssize_t _unlayoutChildCount; ssize_t _unlayoutChildCount;
Vector<Widget*> _widgetChildren; Vector<Widget*> _widgetChildren;