Merge pull request #14600 from enhhh/enh_v3

We should not intercept touch event if scrollview's _direction is NONE
2016-01-21 10:58:20 +08:00 · 2016-01-21 10:58:20 +08:00 · d9af70f913
parent 790c7b4b79 a318e31222
commit d9af70f913
1 changed files with 2 additions and 1 deletions
--- a/cocos/ui/UIScrollView.cpp
+++ b/cocos/ui/UIScrollView.cpp
@ -953,7 +953,8 @@ void ScrollView::interceptTouchEvent(Widget::TouchEventType event, Widget *sende
        Layout::interceptTouchEvent(event, sender, touch);
        return;
    }
-
+    if(_direction == Direction::NONE)
+        return;
    Vec2 touchPoint = touch->getLocation();
    switch (event)
    {