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

implements issue #17069 (#17090) 

implemnts suggestion done by @three0s
This commit is contained in:
Ricardo Quesada 2017-01-02 17:49:22 -08:00 committed by minggo
parent 0564d43478
commit b3279bafa7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/2d/CCMenu.cpp
View File

@ -417,7 +417,7 @@ void Menu::alignItemsInColumnsWithArray(const ValueVector& rows)
// check if too many rows/columns for available menu items // check if too many rows/columns for available menu items
CCASSERT(! columnsOccupied, "columnsOccupied should be 0."); CCASSERT(! columnsOccupied, "columnsOccupied should be 0.");
Size winSize = Director::getInstance()->getWinSize(); Size winSize = getContentSize();
row = 0; row = 0;
rowHeight = 0; rowHeight = 0;
@ -519,7 +519,7 @@ void Menu::alignItemsInRowsWithArray(const ValueVector& columns)
// check if too many rows/columns for available menu items. // check if too many rows/columns for available menu items.
CCASSERT(! rowsOccupied, "rowsOccupied should be 0."); CCASSERT(! rowsOccupied, "rowsOccupied should be 0.");
Size winSize = Director::getInstance()->getWinSize(); Size winSize = getContentSize();
column = 0; column = 0;
columnWidth = 0; columnWidth = 0;