From: Ayush <ayush.sriv@samsung.com>
Date: Thu, 4 Jul 2013 11:00:49 +0000 (+0530)
Subject: Deactivate Tab key operation shifting focus on child controls of SB
X-Git-Tag: submit/tizen_2.2/20130714.153149~108^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=88be5675a753826ce70479ea023bb8a485529aa5;p=framework%2Fosp%2Fuifw.git

Deactivate Tab key operation shifting focus on child controls of SB

Change-Id: Iffbc2c5f80234c5a31e5185d32550ddd078cfd2b
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 dc4f87d..44d5320 100644
--- a/src/ui/controls/FUiCtrl_SearchBar.cpp
+++ b/src/ui/controls/FUiCtrl_SearchBar.cpp
@@ -1830,13 +1830,28 @@ void
 _SearchBar::OnFocusModeStateChanged(void)
 {
 	__isInFocusMode = false;
-	__pEdit->SetSearchFieldFocus(false);
-	__pEdit->Invalidate();
+
+	if (__pEdit->IsFocused())
+	{
+		__pEdit->SetSearchFieldFocus(false);
+		__pEdit->Invalidate();
+	}
+
+	if (__pCancelButton->IsFocused())
+	{
+		__pCancelButton->OnFocusModeStateChanged();
+	}
 
 	return;
 }
 
 bool
+_SearchBar::IsChildControlFocusManage(void) const
+{
+	return true;
+}
+
+bool
 _SearchBar::OnPreviewKeyPressed(const _Control &source, const _KeyInfo &keyInfo)
 {
 	if (!__pEdit->IsUsbKeyboardConnected())
diff --git a/src/ui/inc/FUiCtrl_SearchBar.h b/src/ui/inc/FUiCtrl_SearchBar.h
index b59a1e8..a2b9fd6 100644
--- a/src/ui/inc/FUiCtrl_SearchBar.h
+++ b/src/ui/inc/FUiCtrl_SearchBar.h
@@ -259,7 +259,7 @@ public:
 	virtual bool OnFocusLost(const _Control& source);
 	virtual void OnDrawFocus(void);
 	virtual void OnFocusModeStateChanged(void);
-
+	virtual bool IsChildControlFocusManage(void) const;
 	virtual bool OnPreviewKeyPressed(const _Control& source, const _KeyInfo& keyInfo);
 	virtual bool OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo);