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

Merge pull request #14600 from enhhh/enh_v3 

We should not intercept touch event if scrollview's _direction is NONE
This commit is contained in:
zilongshanren 2016-01-21 10:58:20 +08:00
parent 790c7b4b79 a318e31222
commit d9af70f913
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/ui/UIScrollView.cpp
View File

@ -953,7 +953,8 @@ void ScrollView::interceptTouchEvent(Widget::TouchEventType event, Widget *sende
Layout::interceptTouchEvent(event, sender, touch); Layout::interceptTouchEvent(event, sender, touch);
return; return;
} }
if(_direction == Direction::NONE)
return;
Vec2 touchPoint = touch->getLocation(); Vec2 touchPoint = touch->getLocation();
switch (event) switch (event)
{ {