From 02982133c15d44597efd806653a331c6e28f5f56 Mon Sep 17 00:00:00 2001 From: SungWan Kim Date: Wed, 17 Apr 2013 17:43:47 +0900 Subject: [PATCH] Resolve scroll bug(N_SE-34944, N_SE-34969), and add empty bitmap and text to VcsSelectorForm(N_SE-34955) Change-Id: Ifd7d51e78c9c70e589727f68837fb6ff3c8e39a4 Signed-off-by: SungWan Kim --- inc/ClPanningAnimationManager.h | 1 + res/screen-size-normal/IDL_VCS_SELECTOR_FORM.xml | 2 +- src/ClDayPanel.cpp | 1 + src/ClMonthPanel.cpp | 1 + src/ClPanningAnimationManager.cpp | 6 ++++++ src/ClYearPanel.cpp | 1 + 6 files changed, 11 insertions(+), 1 deletion(-) diff --git a/inc/ClPanningAnimationManager.h b/inc/ClPanningAnimationManager.h index 1e633c2..c0afa25 100644 --- a/inc/ClPanningAnimationManager.h +++ b/inc/ClPanningAnimationManager.h @@ -35,6 +35,7 @@ class PanningAnimationManager { public: result AddView(Tizen::Ui::Control& view, ViewScrollEffect position); + void CancelPanningAnimationEvent(void); void Initialize(const Tizen::Graphics::Rectangle& bounds, IPanningAnimationControlProvider& provider); result RemoveView(ViewScrollEffect position); void ResetPosition(void); diff --git a/res/screen-size-normal/IDL_VCS_SELECTOR_FORM.xml b/res/screen-size-normal/IDL_VCS_SELECTOR_FORM.xml index f010506..a225afe 100644 --- a/res/screen-size-normal/IDL_VCS_SELECTOR_FORM.xml +++ b/res/screen-size-normal/IDL_VCS_SELECTOR_FORM.xml @@ -21,7 +21,7 @@ - + diff --git a/src/ClDayPanel.cpp b/src/ClDayPanel.cpp index 181d969..abfa094 100644 --- a/src/ClDayPanel.cpp +++ b/src/ClDayPanel.cpp @@ -1149,6 +1149,7 @@ DayPanel::OnUserEventReceivedN(RequestId requestId, IList* pArgs) switch (requestId) { case IDA_MAIN_FORM_HEADER_TODAY: + __pPanningAnimationManager->CancelPanningAnimationEvent(); __pPm->SetTodayToCurrentDate(); break; case IDA_SUB_MENU_GO_TO_DATE: diff --git a/src/ClMonthPanel.cpp b/src/ClMonthPanel.cpp index 20aa2ae..5bdb9f3 100644 --- a/src/ClMonthPanel.cpp +++ b/src/ClMonthPanel.cpp @@ -749,6 +749,7 @@ MonthPanel::OnUserEventReceivedN(RequestId requestId, IList* pArgs) switch (requestId) { case IDA_MAIN_FORM_HEADER_TODAY: + __pPanningAnimationManager->CancelPanningAnimationEvent(); __pPm->SetTodayToCurrentDate(); break; case IDA_SUB_MENU_GO_TO_DATE: diff --git a/src/ClPanningAnimationManager.cpp b/src/ClPanningAnimationManager.cpp index 3594acb..1404987 100644 --- a/src/ClPanningAnimationManager.cpp +++ b/src/ClPanningAnimationManager.cpp @@ -87,6 +87,12 @@ PanningAnimationManager::AddView(Control& view, ViewScrollEffect position) } void +PanningAnimationManager::CancelPanningAnimationEvent(void) +{ + ResetPosition(); +} + +void PanningAnimationManager::Initialize(const Rectangle& bounds, IPanningAnimationControlProvider& provider) { __pProvider = &provider; diff --git a/src/ClYearPanel.cpp b/src/ClYearPanel.cpp index 383a61f..8348514 100644 --- a/src/ClYearPanel.cpp +++ b/src/ClYearPanel.cpp @@ -400,6 +400,7 @@ YearPanel::OnUserEventReceivedN(RequestId requestId, IList* pArgs) switch (requestId) { case IDA_MAIN_FORM_HEADER_TODAY: + __pPanningAnimationManager->CancelPanningAnimationEvent(); __pPm->SetTodayToCurrentDate(); break; case IDA_SUB_MENU_GO_TO_DATE: -- 2.7.4