Merge pull request cocos2d#15047 from Zzzen/v3

Let ScrollView swallow touch events by default.
LovelinMangang · Feb 15, 2016 · 79e7706 · 79e7706
2 parents cb60561 + 07051a0
commit 79e7706
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/extensions/GUI/CCScrollView/CCScrollView.cpp b/extensions/GUI/CCScrollView/CCScrollView.cpp
@@ -190,6 +190,7 @@ void ScrollView::setTouchEnabled(bool enabled)
     if (enabled)
     {
         _touchListener = EventListenerTouchOneByOne::create();
+        _touchListener->setSwallowTouches(true);
         _touchListener->onTouchBegan = CC_CALLBACK_2(ScrollView::onTouchBegan, this);
         _touchListener->onTouchMoved = CC_CALLBACK_2(ScrollView::onTouchMoved, this);
         _touchListener->onTouchEnded = CC_CALLBACK_2(ScrollView::onTouchEnded, this);