[Fix for N_SE-41421]Modified the update item count

Change-Id: I159d3dec5037b24874ea108f41bc1354de5d52fb

diff --git a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
index d12ef75..51d66b5 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp
@@ -111,6 +111,12 @@ _EditDatePresenter::~_EditDatePresenter(void)
 
        delete __pContentBgEffectDisabledBitmap;
        __pContentBgEffectDisabledBitmap = null;
+
+       if (__pContentProvider)
+       {
+               __pContentProvider->Destroy();
+               __pContentProvider = null;
+       }
 }
 
 _EditDatePresenter*
@@ -549,7 +555,8 @@ _EditDatePresenter::Draw(void)
        }
 
        Canvas* pCanvas = __pEditDate->GetCanvasN();
-       SysAssertf((pCanvas != null), "Failed to get canvas.");
+       r = GetLastResult();
+       SysTryReturn(NID_UI_CTRL, (pCanvas != null), r, r, "[%s] Propagating. Failed to get canvas.", GetErrorMessage(r));
 
        pCanvas->SetBackgroundColor(Color(0, 0, 0, 0));
        pCanvas->Clear();
@@ -1554,11 +1561,15 @@ _EditDatePresenter::OnVisualElementAnimationFinished (const VisualElementAnimati
        r = GetLastResult();
        SysTryReturnVoidResult(NID_UI_CTRL, (pEditDateElement != null), r, "[%s] Propagating.", GetErrorMessage(r));
 
-       pEditDateElement->DetachChild(*__pContentProvider);
-       __pContentProvider->Destroy();
-       __pContentProvider = null;
+       //__pContentProvider will be destroyed in destructor when OnFormBackRequested() callback is received
+       if (__pContentProvider)
+       {
+               pEditDateElement->DetachChild(*__pContentProvider);
+               __pContentProvider->Destroy();
+               __pContentProvider = null;
+               Draw();
+       }
 
-       Draw();
        return;
 }
 

diff --git a/src/ui/inc/FUiCtrl_DateTimeBarPresenter.h b/src/ui/inc/FUiCtrl_DateTimeBarPresenter.h
index 40f7780..227a2d3 100644 (file)
--- a/src/ui/inc/FUiCtrl_DateTimeBarPresenter.h
+++ b/src/ui/inc/FUiCtrl_DateTimeBarPresenter.h
@@ -169,7 +169,7 @@ private:
        int __focusedIndex;
        Tizen::Graphics::FloatRectangle __focusBounds;
        int __focusedValue;
-       static const int UPDATE_ITEM_COUNT = 3;
+       static const int UPDATE_ITEM_COUNT = 6;
 
 }; // _DateTimeBarPresenter