Fix for N_SE-45383, restricted focus ring drawing in case of IsFocusModeStateEnabled...

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

diff --git a/src/ui/controls/FUiCtrl_TableViewItem.cpp b/src/ui/controls/FUiCtrl_TableViewItem.cpp
index 3af8ab4..9900dcb 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewItem.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewItem.cpp
@@ -4782,6 +4782,11 @@ _TableViewItem::OnAccessibilityValueDecreased(const _AccessibilityContainer& con
 bool
 _TableViewItem::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
 {
+       if (!IsFocusModeStateEnabled())
+       {
+               return false;
+       }
+
        _KeyCode keyCode = keyInfo.GetKeyCode();
        IListT<_Control*>* pFocusList = GetFocusListN();
        SysTryReturn(NID_UI_CTRL, pFocusList != null, true, GetLastResult(), "[%s] propagating.", GetErrorMessage(GetLastResult()));
@@ -5015,6 +5020,11 @@ _TableViewItem::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
 bool
 _TableViewItem::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
 {
+       if (!IsFocusModeStateEnabled())
+       {
+               return false;
+       }
+
        _KeyCode keyCode = keyInfo.GetKeyCode();
 
        if(keyCode == _KEY_ENTER)

diff --git a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
index f504c42..7386279 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
@@ -5312,6 +5312,11 @@ _TableViewPresenter::OnOcurredOverflowItems(const int currentCashSize, const int
 bool
 _TableViewPresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
 {
+       if (!__pTableView->IsFocusModeStateEnabled())
+       {
+               return false;
+       }
+
        _KeyCode keyCode = keyInfo.GetKeyCode();
        _Control* pFocusedControl = null;
        _Window* pTop = source.GetRootWindow();
@@ -5441,6 +5446,11 @@ _TableViewPresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInf
 bool
 _TableViewPresenter::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
 {
+       if (!__pTableView->IsFocusModeStateEnabled())
+       {
+               return false;
+       }
+
         _KeyCode keyCode = keyInfo.GetKeyCode();
 
        if (keyCode == _KEY_UP || keyCode == _KEY_DOWN)
@@ -5454,6 +5464,11 @@ _TableViewPresenter::OnKeyReleased(const _Control& source, const _KeyInfo& keyIn
 void
 _TableViewPresenter::OnDrawFocus(void)
 {
+       if (!__pTableView->IsFocusModeStateEnabled())
+       {
+               return;
+       }
+
         _Control* pFocusedControl = null;
        _Window* pTop = __pTableView->GetRootWindow();
        if (pTop)