Fixed TDIS-5649; Changed to SetVisibleState before every return statement in OnTouchR...

Change-Id: I760e1c9abe2a852510993c5f8abd13c897307af8
Signed-off-by: clone <ingyou.park@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp b/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp
index d77e02d..82d882d 100644 (file)
--- a/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp
@@ -1458,6 +1458,7 @@ _ContextMenuGridPresenter::OnTouchReleased(const _Control& source, const _TouchI
 
                if (pActionEvent == null)
                {
+                       __pContextMenu->SetVisibleState(false);
                        return true;
                }
 
@@ -1468,12 +1469,12 @@ _ContextMenuGridPresenter::OnTouchReleased(const _Control& source, const _TouchI
                {
                        __selectedIndex = -1;
                        __pressedIndex = -1;
+                       __pContextMenu->SetVisibleState(false);
                        return true;
                }
 
                __selectedIndex = -1;
                __pressedIndex = -1;
-               __pContextMenu->SetVisibleState(false);
 
                int actionId = pItem->GetActionId();
 
@@ -1481,10 +1482,12 @@ _ContextMenuGridPresenter::OnTouchReleased(const _Control& source, const _TouchI
 
                if (pEventArg == null)
                {
+                       __pContextMenu->SetVisibleState(false);
                        return true;
                }
 
                PLAY_FEEDBACK(_RESOURCE_FEEDBACK_PATTERN_TAP);
+               __pContextMenu->SetVisibleState(false);
                pActionEvent->Fire(*pEventArg);
        }