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

Merge pull request #5552 from dumganhar/develop 

Adds EventListenerTouchOneByOne::isSwallowTouches, fixes a typo for Director::EVENT_AFTER_UPDATE.
This commit is contained in:
James Chen 2014-03-05 11:31:34 +08:00
parent 574d8554e8 02572da9dc
commit b2c13ee2e3
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/2d/CCDirector.cpp
View File

@ -88,7 +88,7 @@ extern const char* cocos2dVersion(void);
const char *Director::EVENT_PROJECTION_CHANGED = "director_projection_changed"; const char *Director::EVENT_PROJECTION_CHANGED = "director_projection_changed";
const char *Director::EVENT_AFTER_DRAW = "director_after_draw"; const char *Director::EVENT_AFTER_DRAW = "director_after_draw";
const char *Director::EVENT_AFTER_VISIT = "director_after_visit"; const char *Director::EVENT_AFTER_VISIT = "director_after_visit";
const char *Director::EVENT_AFTER_UPDATE = "director_after_udpate"; const char *Director::EVENT_AFTER_UPDATE = "director_after_update";
Director* Director::getInstance() Director* Director::getInstance()
{ {

5
cocos/2d/CCEventListenerTouch.cpp
View File

@ -61,6 +61,11 @@ void EventListenerTouchOneByOne::setSwallowTouches(bool needSwallow)
_needSwallow = needSwallow; _needSwallow = needSwallow;
} }
bool EventListenerTouchOneByOne::isSwallowTouches()
{
return _needSwallow;
}
EventListenerTouchOneByOne* EventListenerTouchOneByOne::create() EventListenerTouchOneByOne* EventListenerTouchOneByOne::create()
{ {
auto ret = new EventListenerTouchOneByOne(); auto ret = new EventListenerTouchOneByOne();

1
cocos/2d/CCEventListenerTouch.h
View File

@ -43,6 +43,7 @@ public:
virtual ~EventListenerTouchOneByOne(); virtual ~EventListenerTouchOneByOne();
void setSwallowTouches(bool needSwallow); void setSwallowTouches(bool needSwallow);
bool isSwallowTouches();
/// Overrides /// Overrides
virtual EventListenerTouchOneByOne* clone() override; virtual EventListenerTouchOneByOne* clone() override;