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

Merge pull request #2950 from zcgit/develop 

a potential bug in Layer.
This commit is contained in:
James Chen 2013-08-19 19:02:53 -07:00
parent 175316f2c6 912a52a677
commit 7e3d3b3d3e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
View File

@ -68,8 +68,8 @@ bool Layer::init()
Director * pDirector;
CC_BREAK_IF(!(pDirector = Director::getInstance()));
this->setContentSize(pDirector->getWinSize());
_touchEnabled = false;
_accelerometerEnabled = false;
setTouchEnabled(false);
setAccelerometerEnabled(false);
// success
bRet = true;
} while(0);

2
extensions/GUI/CCScrollView/CCScrollView.cpp
View File

@ -183,7 +183,7 @@ void ScrollView::setTouchEnabled(bool e)
{
_dragging = false;
_touchMoved = false;
_touches->removeAllObjects();
if(_touches)_touches->removeAllObjects();
}
}