From 398a4ab8739ba5b95e721ec9cf65b54e8210119b Mon Sep 17 00:00:00 2001 From: SangYong Lee Date: Tue, 26 Mar 2013 14:03:15 +0900 Subject: [PATCH] Modified context item sweep operation Change-Id: I39d51ca44708ceeeaaae295d54322a08684cd25c Signed-off-by: SangYong Lee --- src/ui/controls/FUiCtrl_TableViewPresenter.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp index 09cd71c..76ca821 100644 --- a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp +++ b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp @@ -2883,11 +2883,9 @@ _TableViewPresenter::ScrollToInternal(float newPosition) { if (!IsScrollEnabled()) { - return 0; + return 0.0f; } - ResetSweepItem(); - if (IsScrollAnimationRunning()) { if (__scrollPositionOnFlickStarted > newPosition) @@ -3022,6 +3020,7 @@ _TableViewPresenter::ScrollToItem(int groupIndex, int itemIndex, TableViewScroll TableViewItemTag itemPos = {groupIndex, itemIndex}; StopAllItemAnimation(); + ResetSweepItem(); if (!__pListModel->IsLoadedItem(groupIndex, itemIndex)) { @@ -3054,6 +3053,8 @@ _TableViewPresenter::ScrollByPixel(float scrollDistance) result r = GetLastResult(); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); + ResetSweepItem(); + ScrollTo(scrollDistance + GetScrollPosition()); r = GetLastResult(); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); -- 2.7.4