Fixed VI

Change-Id: Iea648afac2c03ade7f6dcac5712f8b5879efe634
Signed-off-by: HeeJu Kang <mobum.kang@samsung.com>

diff --git a/src/FShell_AppWidgetPopupView.cpp b/src/FShell_AppWidgetPopupView.cpp
index 815f7db..ed8bb20 100644 (file)
--- a/src/FShell_AppWidgetPopupView.cpp
+++ b/src/FShell_AppWidgetPopupView.cpp
@@ -213,14 +213,15 @@ _AppWidgetPopupView::GetTouchPostion(const Tizen::Graphics::FloatPoint& point, d
 void
 _AppWidgetPopupView::PlayAnimation(bool open)
 {
-       const int ANIMATION1_DURATION = 100;
-//     const int ANIMATION2_DURATION = 300;
+       const int ANIMATION_DURATION = 250;
 
        _VisualElement* pVisualElement = GetVisualElement();
        result r = GetLastResult();
        SysTryReturnVoidResult(NID_UI_CTRL, pVisualElement, r, "[%s] Propagating.", GetErrorMessage(r));
 
        VisualElementAnimationGroup animationGroup;
+
+       animationGroup.SetDuration(ANIMATION_DURATION);
        animationGroup.SetVisualElementAnimationStatusEventListener(this);
 
        FloatRectangle bounds = GetBoundsF();
@@ -239,10 +240,10 @@ _AppWidgetPopupView::PlayAnimation(bool open)
        animation1.SetPropertyName(L"bounds");
        animation1.SetStartValue(Variant(startBounds));
        animation1.SetEndValue(Variant(endBounds));
-       animation1.SetDuration(ANIMATION1_DURATION);
+       animation1.SetDuration(ANIMATION_DURATION);
 
        animationGroup.AddAnimation(animation1);
-/*
+
        float startOpacity = 0.0f;
        float endOpacity = 1.0f;
        if (!open)
@@ -255,10 +256,10 @@ _AppWidgetPopupView::PlayAnimation(bool open)
        animation2.SetPropertyName(L"opacity");
        animation2.SetStartValue(Variant(startOpacity));
        animation2.SetEndValue(Variant(endOpacity));
-       animation2.SetDuration(ANIMATION2_DURATION);
+       animation2.SetDuration(ANIMATION_DURATION);
 
        animationGroup.AddAnimation(animation2);
-*/
+
        String keyName = (open) ? OPEN_ANIMATION : CLOSE_ANIMATION;
        pVisualElement->AddAnimation(keyName, animationGroup);
 }

diff --git a/src/FShell_AppWidgetView.cpp b/src/FShell_AppWidgetView.cpp
index a9a62e3..888b405 100644 (file)
--- a/src/FShell_AppWidgetView.cpp
+++ b/src/FShell_AppWidgetView.cpp
@@ -61,7 +61,7 @@ using namespace Tizen::Media;
 namespace Tizen { namespace Shell
 {
 
-const int ANIMATION_DURATION = 150;
+const int ANIMATION_DURATION = 200;
 const wchar_t* CLICK_ANIMATION = L"Click";
 const wchar_t* FLICK_ANIMATION = L"Flick";