Fix N_SE-55102

Change-Id: I0f25b61fc324d1e5057dc22aa086a34cc7126f30

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index 41d2d51..1c45401 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -1177,6 +1177,8 @@ _EditPresenter::Dispose(void)
                __isKeypadExist = false;
 
                __latestBoundedContext = null;
+
+               __pEdit->DetachScrollPanelEvent();
        }
 
        __initialFooterVisibleStatus = EDIT_FOOTER_VISIBLE_STATUS_NONE;
@@ -7878,6 +7880,9 @@ _EditPresenter::ShowKeypad(bool focus)
        {
                SetCurrentLanguage(initialKeypadLanguage);
        }
+
+       __pEdit->AttachScrollPanelEvent();
+
        //layout rearrange
        if (__isUSBKeyboardConnected)
        {
@@ -7888,7 +7893,6 @@ _EditPresenter::ShowKeypad(bool focus)
                if (__isKeypadCommandButtonVisible)
                {
                        __pEdit->SendKeypadEvent(GetKeypadAction(), CORE_KEYPAD_EVENT_STATUS_CREATED);
-                       __pEdit->AttachScrollPanelEvent();
                        __pEdit->SendScrollPanelEvent(CORE_OVERLAY_CONTROL_CREATED);
 
                        if (__initialFooterVisibleStatus == EDIT_FOOTER_VISIBLE_STATUS_NONE)
@@ -7927,7 +7931,6 @@ _EditPresenter::ShowKeypad(bool focus)
                                if (sendKeypadEventForcely)
                                {
                                        __pEdit->SendKeypadEvent(GetKeypadAction(), CORE_KEYPAD_EVENT_STATUS_CREATED);
-                                       __pEdit->AttachScrollPanelEvent();
                                        __pEdit->SendScrollPanelEvent(CORE_OVERLAY_CONTROL_CREATED);
                                }
 
@@ -7966,7 +7969,6 @@ _EditPresenter::ShowKeypad(bool focus)
                                if (!__pCommandButton || (__pCommandButton && !__pCommandButton->GetVisibleState()))
                                {
                                        __pEdit->SendKeypadEvent(GetKeypadAction(), CORE_KEYPAD_EVENT_STATUS_CREATED);
-                                       __pEdit->AttachScrollPanelEvent();
                                        __pEdit->SendScrollPanelEvent(CORE_OVERLAY_CONTROL_CREATED);
                                        __pEdit->SendKeypadEvent(GetKeypadAction(), CORE_KEYPAD_EVENT_STATUS_OPEN);
                                        __pEdit->SendScrollPanelEvent(CORE_OVERLAY_CONTROL_OPENED);
@@ -7978,7 +7980,6 @@ _EditPresenter::ShowKeypad(bool focus)
                                {
                                        __pEdit->SendKeypadEvent(GetKeypadAction(), CORE_KEYPAD_EVENT_STATUS_CREATED);
                                }
-                               __pEdit->AttachScrollPanelEvent();
                                __pEdit->SendScrollPanelEvent(CORE_OVERLAY_CONTROL_CREATED);
                        }
 
@@ -8015,7 +8016,6 @@ _EditPresenter::ShowKeypad(bool focus)
                        if (sendKeypadEventForcely)
                        {
                                __pEdit->SendKeypadEvent(GetKeypadAction(), CORE_KEYPAD_EVENT_STATUS_CREATED);
-                               __pEdit->AttachScrollPanelEvent();
                                __pEdit->SendScrollPanelEvent(CORE_OVERLAY_CONTROL_CREATED);
                        }