Rollback the code regarding back and menu key.

Change-Id: I97feb1393a933a6a50561409c3dfd2040bcf2ce1

diff --git a/src/ui/controls/FUiCtrl_FormImpl.cpp b/src/ui/controls/FUiCtrl_FormImpl.cpp
index 1def572..8cbfdac 100644 (file)
--- a/src/ui/controls/FUiCtrl_FormImpl.cpp
+++ b/src/ui/controls/FUiCtrl_FormImpl.cpp
@@ -376,6 +376,8 @@ _FormImpl::SetFormStyle(unsigned long formStyle)
 
                        r = GetCore().AttachSystemChild(pHeader->GetCore());
                        SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
+
+                       GetCore().SetFormBackEventListener(this);
                }
        }
        else if (formStyle & FORM_STYLE_TITLE)
@@ -493,6 +495,9 @@ _FormImpl::SetFormStyle(unsigned long formStyle)
 
                        r = GetCore().AttachSystemChild(pFooter->GetCore());
                        SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
+
+                       GetCore().SetFormBackEventListener(this);
+                       GetCore().SetFormMenuEventListener(this);
                }
        }
        else if (formStyle & FORM_STYLE_SOFTKEY_0 || formStyle & FORM_STYLE_SOFTKEY_1 || formStyle & FORM_STYLE_OPTIONKEY)
@@ -539,9 +544,6 @@ _FormImpl::SetFormStyle(unsigned long formStyle)
                }
        }
 
-       GetCore().SetFormBackEventListener(this);
-       GetCore().SetFormMenuEventListener(this);
-
        GetCore().AdjustClientBounds();
 
        SetLastResult(E_SUCCESS);