Fixed DCM-1531

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

diff --git a/src/FShell_AppWidgetPopupView.cpp b/src/FShell_AppWidgetPopupView.cpp
index e9a6bda..4637e76 100644 (file)
--- a/src/FShell_AppWidgetPopupView.cpp
+++ b/src/FShell_AppWidgetPopupView.cpp
@@ -71,6 +71,7 @@ _AppWidgetPopupView::_AppWidgetPopupView(_AppWidgetView& appwidgetView)
        , __pAppWidgetPopupViewEvent(_AppWidgetPopupViewEvent::CreateInstanceN(*this))
        , __firstUpdated(false)
        , __pixmap(-1)
+       , __touchInside(false)
 {
 }
 
@@ -314,11 +315,21 @@ _AppWidgetPopupView::OnDeactivated(void)
 bool
 _AppWidgetPopupView::OnTouchPressed(const _Control& source, const _TouchInfo& touchInfo)
 {
+       FloatRectangle clientBounds(GetClientBoundsF());
+
+       Point position = _CoordinateSystemUtils::ConvertToInteger(touchInfo.GetCurrentPosition());
+
+       FloatPoint floatPosition(static_cast<float>(position.x), static_cast<float>(position.y));
+
+       if (clientBounds.Contains(floatPosition))
+       {
+               __touchInside = true;
+       }
+
        double x = 0.0;
        double y = 0.0;
 
-       Point position = _CoordinateSystemUtils::ConvertToInteger(touchInfo.GetCurrentPosition());
-       GetTouchPostion(FloatPoint(static_cast<float>(position.x), static_cast<float>(position.y)), x, y);
+       GetTouchPostion(floatPosition, x, y);
 
        livebox_content_event(__pAppWidgetView->__pAppWidget, PD_MOUSE_DOWN, x, y);
 
@@ -333,11 +344,13 @@ _AppWidgetPopupView::OnTouchReleased(const _Control& source, const _TouchInfo& t
        Point position = _CoordinateSystemUtils::ConvertToInteger(touchInfo.GetCurrentPosition());
        FloatPoint floatPosition(static_cast<float>(position.x), static_cast<float>(position.y));
 
-       if (!clientBounds.Contains(floatPosition))
+       if (!__touchInside && !clientBounds.Contains(floatPosition))
        {
                PlayAnimation(false);
        }
 
+       __touchInside = false;
+
        double x = 0.0;
        double y = 0.0;
 

diff --git a/src/FShell_AppWidgetPopupView.h b/src/FShell_AppWidgetPopupView.h
index 3e7266e..21f3330 100644 (file)
--- a/src/FShell_AppWidgetPopupView.h
+++ b/src/FShell_AppWidgetPopupView.h
@@ -124,6 +124,7 @@ private:
        std::unique_ptr<_AppWidgetPopupViewEvent> __pAppWidgetPopupViewEvent;
        bool __firstUpdated;
        int __pixmap;
+       bool __touchInside;
 
        struct _EvasObjectDeleter
        {