From: Ayush <ayush.sriv@samsung.com>
Date: Mon, 15 Jul 2013 12:52:03 +0000 (+0530)
Subject: Fix for N_SE-46376 and N_SE-46424/Firing CancelButton events on Enter
X-Git-Tag: accepted/tizen/20130924.144426~1^2~11^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=daa86b0df25229e2ea33bcd06c8e12d20fbdfe5c;p=platform%2Fframework%2Fnative%2Fuifw.git

Fix for N_SE-46376 and N_SE-46424/Firing CancelButton events on Enter

Change-Id: I3c12dd2f69b0b7725f54f4d84eed0a260ea0ab93
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 e4676cc..74a3a34 100644
--- a/src/ui/controls/FUiCtrl_SearchBar.cpp
+++ b/src/ui/controls/FUiCtrl_SearchBar.cpp
@@ -1625,7 +1625,7 @@ _SearchBar::OnPreviewTouchReleased(const _Control& source, const _TouchInfo& tou
 }
 
 void
-_SearchBar::OnActionPerformed(const _Control& source, int actionId)
+_SearchBar::FireButtonActionEvent(const _Control &source, int actionId)
 {
 	if (__actionId == actionId)
 	{
@@ -1645,6 +1645,12 @@ _SearchBar::OnActionPerformed(const _Control& source, int actionId)
 		}
 		__isCancelActionInProgress = false;
 	}
+}
+
+void
+_SearchBar::OnActionPerformed(const _Control& source, int actionId)
+{
+	FireButtonActionEvent(source, actionId);
 	return;
 }
 
@@ -1965,9 +1971,7 @@ _SearchBar::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
 		case _KEY_ENTER:
 			if (&source == __pCancelButton)
 			{
-				SetFocusCallbackParameter(true);
-				SetMode(SEARCH_BAR_MODE_NORMAL);
-				SetFocused();
+				FireButtonActionEvent(source, __actionId);
 				_Control::OnDrawFocus();
 
 				return true;
diff --git a/src/ui/inc/FUiCtrl_SearchBar.h b/src/ui/inc/FUiCtrl_SearchBar.h
index a2b9fd6..4c66b7d 100644
--- a/src/ui/inc/FUiCtrl_SearchBar.h
+++ b/src/ui/inc/FUiCtrl_SearchBar.h
@@ -282,6 +282,7 @@ private:
 	result CreateContentsArea(void);
 	result CreateClippedGroupControl(void);
 	void InitializeAccessibility(void);
+	void FireButtonActionEvent(const Tizen::Ui::_Control& source, int actionId);
 
 	Tizen::Ui::_Control* GetParentForm(void) const;