Fix for N_SE-49533 (FocusUI for InternetApp)

Change-Id: I8b64158fe0590c0420c5192183be008c5d50fd50
Signed-off-by: katpaga.a <katpaga.a@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp b/src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp
index 4d3b599..604a522 100644 (file)
--- a/src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp
+++ b/src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp
@@ -1949,7 +1949,7 @@ _GroupedListViewImpl::OnBoundsChanged(void)
 
        if (__isOrientationChanged)
        {
-               if (GetCore().IsTableViewFocused())
+               if (GetCore().IsTableViewFocused() && GetCore().IsFocusModeStateEnabled())
                {
                        GetCore().RestoreFocus(true);
                }

diff --git a/src/ui/controls/FUiCtrl_ListViewImpl.cpp b/src/ui/controls/FUiCtrl_ListViewImpl.cpp
index 9150fac..9177d34 100644 (file)
--- a/src/ui/controls/FUiCtrl_ListViewImpl.cpp
+++ b/src/ui/controls/FUiCtrl_ListViewImpl.cpp
@@ -1809,7 +1809,7 @@ _ListViewImpl::OnBoundsChanged(void)
        if (__isOrientationChanged)
        {
                __isOrientationChanged = false;
-               if (GetCore().IsTableViewFocused())
+               if (GetCore().IsTableViewFocused() && GetCore().IsFocusModeStateEnabled())
                {
                        GetCore().RestoreFocus(true);
                }