!211 修复scroll view rebound 功能失效

Merge pull request !211 from guyuanzhang/scroll_master

frameworks/components/ui_abstract_scroll.cpp

@@ -289,7 +289,7 @@ void UIAbstractScroll::ListAnimatorCallback::Callback(UIView* view)
 
     UIAbstractScroll* scrollView = static_cast<UIAbstractScroll*>(view);
     scrollView->isDragging_ = true;
-
+    curtTime_++;
     if (curtTime_ <= dragTimes_) {
         bool needStopX = false;
         bool needStopY = false;
@@ -313,8 +313,6 @@ void UIAbstractScroll::ListAnimatorCallback::Callback(UIView* view)
         }
         if (needStopX && needStopY) {
             scrollView->StopAnimator();
-        } else {
-            curtTime_++;
         }
     } else {
         scrollView->StopAnimator();

test/uitest/test_ui_scroll_view/ui_test_ui_scroll_view.cpp

@@ -119,6 +119,7 @@ void UITestUIScrollView::UIKit_UIScrollView_Test_bar_001()
     scroll->SetPosition(positionX_, positionY_, g_scrollW, g_scrollH);
     VISIBLE_XBAR(false);
     scroll->SetYScrollBarVisible(true);
+    scroll->SetReboundSize(50); // 50 : rebound size
     container_->Add(scroll);
     UILabelButton* button1 = new UILabelButton();
     button1->SetPosition(0, 0, g_buttonW, g_buttonH);