Fix for N_SE-53125 - IconListView focus retain after popup/msgbox

Change-Id: I4309c1ebaedf4a9849ce5ecbb35d0ca39880ca1a
Signed-off-by: Sreedeep Moulik <sreedeep.m@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_IconListPresenter.cpp b/src/ui/controls/FUiCtrl_IconListPresenter.cpp
index 0282890..3a8311b 100644 (file)
--- a/src/ui/controls/FUiCtrl_IconListPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_IconListPresenter.cpp
@@ -2857,7 +2857,11 @@ _IconListPresenter::OnFocusModeStateChanged(void)
 void
 _IconListPresenter::OnDrawFocus(void)
 {
-       __highlightedIndex = 0;
+       if (__highlightedIndex == INVALID_INDEX)
+       {
+               __highlightedIndex = 0;
+       }
+
        DrawFocusUi(__highlightedIndex);
 }
 
@@ -2867,7 +2871,6 @@ _IconListPresenter::OnFocusLost(void)
        if (__highlightedIndex != INVALID_INDEX)
        {
                RedrawItem(__highlightedIndex, false);
-               __highlightedIndex = INVALID_INDEX;
        }
 }