Fix for N_SE-51834-Reset Focus from Annex

Signed-off-by: Vinay Dutt Vyas <vinay.vyas@samsung.com>
Change-Id: I9020f21052bc1505c6e3a733929d2ce7c6d90c5e
Signed-off-by: Vinay Dutt Vyas <vinay.vyas@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_TableViewItem.cpp b/src/ui/controls/FUiCtrl_TableViewItem.cpp
index 012f09b..aaa692d 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewItem.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewItem.cpp
@@ -5136,8 +5136,6 @@ _TableViewItem::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
 void
 _TableViewItem::OnFocusModeStateChanged(void)
 {
-       __releasedControl = TABLE_VIEW_ITEM_PRESSED_NONE;
-
        ResetItemState();
 }
 
@@ -5146,6 +5144,7 @@ _TableViewItem::ResetItemState(void)
 {
        __itemSelected = false;
        __drawingStatus = TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL;
+       __releasedControl = TABLE_VIEW_ITEM_PRESSED_NONE;
 
        if (__annexStyle == TABLE_VIEW_ANNEX_STYLE_DETAILED)
        {

diff --git a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
index db8968d..78c0cd1 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
@@ -1951,6 +1951,14 @@ _TableViewPresenter::OnPreviewTouchPressed(const _Control& source, const _TouchI
 {
        _UiTouchEventDelivery response = _ScrollPanelPresenter::OnPreviewTouchPressed(source, touchInfo);
 
+       if (__focusItemTag.groupIndex != -1)
+       {
+               _TableViewItem *pItem = FindItem(__focusItemTag);
+               if (pItem)
+               {
+                       pItem->ResetItemState();
+               }
+       }
        __focusItemTag.groupIndex = -1;
        __focusItemTag.itemIndex = -1;