From e217b9e6e1da871ca46e7536f02e5b0f922b2b28 Mon Sep 17 00:00:00 2001 From: Keuckdo Bang Date: Wed, 12 Jun 2013 18:42:52 +0900 Subject: [PATCH] Rollback the code regarding back and menu key. Change-Id: I97feb1393a933a6a50561409c3dfd2040bcf2ce1 --- src/ui/controls/FUiCtrl_FormImpl.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ui/controls/FUiCtrl_FormImpl.cpp b/src/ui/controls/FUiCtrl_FormImpl.cpp index 1def572..8cbfdac 100644 --- 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); -- 2.7.4