From 6e647143315290a6f28c498664ca0aaa665a59ac Mon Sep 17 00:00:00 2001
From: andyque <guanghui8827@126.com>
Date: Wed, 2 Jul 2014 11:48:28 +0800
Subject: [PATCH] fix scroll

---
 cocos/ui/UIScrollView.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cocos/ui/UIScrollView.cpp b/cocos/ui/UIScrollView.cpp
index 0797cb0b98..4669199ad9 100644
--- a/cocos/ui/UIScrollView.cpp
+++ b/cocos/ui/UIScrollView.cpp
@@ -852,7 +852,7 @@ bool ScrollView::checkCustomScrollDestination(float* touchOffsetX, float* touchO
 bool ScrollView::scrollChildrenVertical(float touchOffsetX, float touchOffsetY)
 {
     float realOffset = touchOffsetY;
-    bool scrollEnabled = false;
+    bool scrollEnabled = true;
     if (_bounceEnabled)
     {
         float icBottomPos = _innerContainer->getBottomBoundary();
@@ -894,7 +894,7 @@ bool ScrollView::scrollChildrenVertical(float touchOffsetX, float touchOffsetY)
     
 bool ScrollView::scrollChildrenHorizontal(float touchOffsetX, float touchOffestY)
 {
-    bool scrollenabled = false;
+    bool scrollenabled = true;
     float realOffset = touchOffsetX;
     if (_bounceEnabled)
     {
@@ -936,7 +936,7 @@ bool ScrollView::scrollChildrenHorizontal(float touchOffsetX, float touchOffestY
     
 bool ScrollView::scrollChildrenBoth(float touchOffsetX, float touchOffsetY)
 {
-    bool scrollenabled = false;
+    bool scrollenabled = true;
     float realOffsetX = touchOffsetX;
     float realOffsetY = touchOffsetY;
     if (_bounceEnabled)