Fixed N_SE-42996,N_SE-43176 added sweep operation in OnTouchCancle, modified focus ui

Change-Id: I9f99662f7b7ba7c60e227c382518929e5171ab41
Signed-off-by: SangYong Lee <sangyongim.lee@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
index 3c585a7..0edf42a 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
@@ -2015,6 +2015,11 @@ _TableViewPresenter::OnTouchReleased(const _Control& source, const _TouchInfo& t
 bool
 _TableViewPresenter::OnTouchCanceled(const _Control& source, const _TouchInfo& touchInfo)
 {
+       if (__sweepOccured)
+       {
+               ResetSweptItem();
+       }
+
        if (__pTableView->IsReorderModeEnabled() && __reorderInfo.itemIndex != -1)
        {
                ResetReorderItem(__reorderInfo.groupIndex, __reorderInfo.itemIndex);
@@ -5489,17 +5494,17 @@ _TableViewPresenter::OnDrawFocus(void)
 void
 _TableViewPresenter::OnFocusModeStateChanged(void)
 {
-        _Control* pFocusedControl = null;
        _Window* pTop = __pTableView->GetRootWindow();
-       if (pTop)
+
+       if (pTop != null)
        {
-               pFocusedControl = pTop->GetCurrentFocusControl();
-       }
+               _Control* pFocusedControl = pTop->GetCurrentFocusControl();
 
-        if (pFocusedControl != null)
-        {
-                pFocusedControl->SetFocused(false);
-        }
+               if (pFocusedControl != null)
+               {
+                       pFocusedControl->RemoveFocusRing();
+               }
+       }
 }
 
 bool