modify footer action fire

Change-Id: I34ea8c7861cbe54e29ab8aef96e921b9107f3175

diff --git a/src/ui/controls/FUiCtrl_FooterImpl.cpp b/src/ui/controls/FUiCtrl_FooterImpl.cpp
index d3caaee..49aa2ed 100644 (file)
--- a/src/ui/controls/FUiCtrl_FooterImpl.cpp
+++ b/src/ui/controls/FUiCtrl_FooterImpl.cpp
@@ -827,11 +827,12 @@ _FooterImpl::RemoveActionEventListener(IActionEventListener& listener)
 void
 _FooterImpl::OnActionPerformed(const _Control& source, int actionId)
 {
-       //if (__calledBySetItemSelected)
-       //{
-       //      __calledBySetItemSelected = false;
-       //      return ;
-       //}
+       _Button* pButton = dynamic_cast<_Button*>(const_cast<_Control*>(&source));
+
+       if (pButton == GetCore().GetButton(BACK_BUTTON))
+       {
+               return ;
+       }
 
        if (GetCore().IsInitialDraw() == true && GetCore().GetSelectedItemIndex() == 0)
        {

diff --git a/src/ui/controls/FUiCtrl_HeaderImpl.cpp b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
index a2dd410..cdf084f 100644 (file)
--- a/src/ui/controls/FUiCtrl_HeaderImpl.cpp
+++ b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
@@ -1086,11 +1086,12 @@ _HeaderImpl::RemoveActionEventListener(IActionEventListener& listener)
 void
 _HeaderImpl::OnActionPerformed(const _Control& source, int actionId)
 {
-       //if (__calledBySetItemSelected)
-       //{
-       //      __calledBySetItemSelected = false;
-       //      return ;
-       //}
+       _Button* pButton = dynamic_cast<_Button*>(const_cast<_Control*>(&source));
+
+       if (pButton == GetCore().GetButton(BACK_BUTTON))
+       {
+               return ;
+       }
 
        if (GetCore().IsInitialDraw() == true && GetCore().GetSelectedItemIndex() == 0)
        {