Resolve scroll bug(N_SE-34944, N_SE-34969), and add empty bitmap and text to VcsSelec...

Change-Id: Ifd7d51e78c9c70e589727f68837fb6ff3c8e39a4
Signed-off-by: SungWan Kim <sw0726.kim@samsung.com>

diff --git a/inc/ClPanningAnimationManager.h b/inc/ClPanningAnimationManager.h
index 1e633c2..c0afa25 100644 (file)
--- 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 (file)
--- a/res/screen-size-normal/IDL_VCS_SELECTOR_FORM.xml
+++ b/res/screen-size-normal/IDL_VCS_SELECTOR_FORM.xml
@@ -21,7 +21,7 @@
         <itemSet/>
     </Header>
     <ListView id="IDC_LISTVIEW" parent="IDL_VCS_SELECTOR_FORM">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="" fastScroll="false" itemDivider="true" itemDividerColor="" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sweepEnabled="false" textOfEmptyList=""/>
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="00_Nocontents_text.png" colorOfEmptyListText="" fastScroll="false" itemDivider="true" itemDividerColor="" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sweepEnabled="false" textOfEmptyList="::IDS_COM_BODY_NO_ITEMS"/>
         <layout bottomRelation="IDL_VCS_SELECTOR_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="1011.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_VCS_SELECTOR_FORM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_VCS_SELECTOR_FORM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_VCS_SELECTOR_FORM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_PARENT" width="720.0" x="0" y="0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="124.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="458.0" x="821.0" y="101.0"/>
     </ListView>

diff --git a/src/ClDayPanel.cpp b/src/ClDayPanel.cpp
index 181d969..abfa094 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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: