Merge pull request #4497 from zhiqiangxu/develop

closed #3559: Useless conversion in ScrollView::onTouchBegan
2014-01-01 17:55:41 -08:00 · 2014-01-01 17:55:41 -08:00 · d1ad635ad8
parent e5389ddb31 e8f55069e3
commit d1ad635ad8
1 changed files with 1 additions and 1 deletions
--- a/extensions/GUI/CCScrollView/CCScrollView.cpp
+++ b/extensions/GUI/CCScrollView/CCScrollView.cpp
@ -594,7 +594,7 @@ bool ScrollView::onTouchBegan(Touch* touch, Event* event)
    //dispatcher does not know about clipping. reject touches outside visible bounds.
    if (_touches.size() > 2 ||
        _touchMoved          ||
-        !frame.containsPoint(_container->convertToWorldSpace(_container->convertTouchToNodeSpace(touch))))
+        !frame.containsPoint(touch->getLocation()))
    {
        return false;
    }