add patch

[framework/osp/uifw.git] / src / ui / controls / FUiCtrl_Edit.cpp

diff --git a/src/ui/controls/FUiCtrl_Edit.cpp b/src/ui/controls/FUiCtrl_Edit.cpp
index 689af2d..839a22e 100755 (executable)
--- a/src/ui/controls/FUiCtrl_Edit.cpp
+++ b/src/ui/controls/FUiCtrl_Edit.cpp
@@ -125,7 +125,6 @@ _EditInternalTouchEventListener::OnTouchPressed(const _Control& source, const _T
                }
                else if (pEditPresenter->IsCopyPasteHandle(source))
                {
-                       pEditPresenter->ReleaseCopyPastePopup();
                        return false;
                }
                else if (pEditPresenter->IsCopyPastePopupExist())
@@ -522,7 +521,7 @@ _Edit::Initialize(int editStyle, InputStyle inputStyle, int limitLength, GroupSt
                {
                        __pClearButtonTextAccessibilityElement = new _AccessibilityElement(true);
                        __pClearButtonTextAccessibilityElement->SetBounds(_pEditPresenter->GetClearIconBoundsF());
-                       __pClearButtonTextAccessibilityElement->SetLabel(L"all clear");
+//                     __pClearButtonTextAccessibilityElement->SetLabel(L"all clear");
                        __pClearButtonTextAccessibilityElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
                        __pClearButtonTextAccessibilityElement->SetName(L"EditFieldClearButton");
                        pEditAccessibilityContainer->AddElement(*__pClearButtonTextAccessibilityElement);
@@ -1084,7 +1083,7 @@ _Edit::UpdateAccessibilityElement(EditAccessibilityElementType type)
                                {
                                        __pClearButtonTextAccessibilityElement = new _AccessibilityElement(true);
                                        __pClearButtonTextAccessibilityElement->SetBounds(_pEditPresenter->GetClearIconBoundsF());
-                                       __pClearButtonTextAccessibilityElement->SetLabel(L"all clear");
+//                                     __pClearButtonTextAccessibilityElement->SetLabel(L"all clear");
                                        __pClearButtonTextAccessibilityElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
                                        __pClearButtonTextAccessibilityElement->SetName(L"EditFieldClearButton");
                                        pEditAccessibilityContainer->AddElement(*__pClearButtonTextAccessibilityElement);
@@ -2722,6 +2721,8 @@ _Edit::SendKeypadEvent(CoreKeypadAction keypadAction, CoreKeypadEventStatus even
                IEventArg* pEventArg = _KeypadEvent::CreateKeypadEventArgN(keypadAction, eventstatus);
                SysTryReturn(NID_UI_CTRL, pEventArg, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Unable to create _KeypadEventArg.");
 
+               _pEditPresenter->SetSentKeypadEvent(eventstatus);
+
                __pKeypadEvent->Fire(*pEventArg);
        }