Fix for jira issue N_SE-55794.

Signed-off-by: sriram.k <sriram.k@samsung.com>
Change-Id: Ic4dd3f8b166596dc0eef6e16f333696eb21dd73e

diff --git a/src/ui/controls/FUiCtrl_OptionMenu.cpp b/src/ui/controls/FUiCtrl_OptionMenu.cpp
index b63de4c..12d5f2c 100644 (file)
--- a/src/ui/controls/FUiCtrl_OptionMenu.cpp
+++ b/src/ui/controls/FUiCtrl_OptionMenu.cpp
@@ -348,7 +348,6 @@ _OptionMenu::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
        {
                __isFocused = false;
                __pOptionMenuPresenter->ClearFocus();
-
                CloseAnimation(-1);
                return true;
        }
@@ -373,6 +372,15 @@ _OptionMenu::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
 void
 _OptionMenu::OnVisualElementAnimationFinished(const Tizen::Ui::Animations::VisualElementAnimation& animation, const Tizen::Base::String& keyName, Tizen::Ui::Animations::VisualElement& target, bool completedNormally)
 {
+       if (!completedNormally)
+       {
+               VisualElementPropertyAnimation* pPropertyAnimation = dynamic_cast< VisualElementPropertyAnimation* >(const_cast< VisualElementAnimation* >(&animation));
+               if (pPropertyAnimation)
+               {
+                       target.SetProperty(keyName, pPropertyAnimation->GetEndValue());
+               }
+       }
+
        __isAnimating = false;
 
        if (keyName == L"ClosingOpacityAnimation")
@@ -1453,8 +1461,8 @@ _OptionMenu::OpenAnimation()
 
        pOpacityAnimation->SetVisualElementAnimationStatusEventListener(this);
 
-       pVisualElement->AddAnimation(L"OpeningBoundsAnimation", *pBoundsAnimation);
-       pVisualElement->AddAnimation(L"OpeningOpacityAnimation", *pOpacityAnimation);
+       pVisualElement->AddAnimation(L"bounds", *pBoundsAnimation);
+       pVisualElement->AddAnimation(L"opacity", *pOpacityAnimation);
 
        __isAnimating = true;