SB Right Key operation modified

Change-Id: I349504533e30d0a0851a0546c5657a781621a802
Signed-off-by: Ayush <ayush.sriv@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_SearchBar.cpp b/src/ui/controls/FUiCtrl_SearchBar.cpp
index fe79ded..1ad9ffe 100644 (file)
--- a/src/ui/controls/FUiCtrl_SearchBar.cpp
+++ b/src/ui/controls/FUiCtrl_SearchBar.cpp
@@ -1814,15 +1814,17 @@ _SearchBar::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
                        SetFocusCallbackParameter(false);
                        if (&source == __pEdit)
                        {
-                               if ((!__isButtonEnabled || !__isUsableCancelButton) && __pContentControl && __pContentControl->GetEnableState())
+                               if ((!__isButtonEnabled || !__isUsableCancelButton) && __pContentControl && __pContentControl->GetVisibleState() && __pContentControl->GetEnableState())
                                {
                                        __pContentControl->SetFocused();
                                        __pContentControl->OnDrawFocus();
 
                                        return true;
                                }
-
-                               __pCancelButton->SetFocused();
+                               else if (__isButtonEnabled && __isUsableCancelButton)
+                               {
+                                       __pCancelButton->SetFocused();
+                               }
 
                                return true;
                        }