fixed bug about TextEvent / reverse handler

Change-Id: I4b00291e84c8f9b8f7557a6fadc2f78e08835e50

diff --git a/src/ui/controls/FUiCtrl_Edit.cpp b/src/ui/controls/FUiCtrl_Edit.cpp
index b77d7df..0f9327c 100755 (executable)
--- a/src/ui/controls/FUiCtrl_Edit.cpp
+++ b/src/ui/controls/FUiCtrl_Edit.cpp
@@ -118,10 +118,7 @@ _EditInternalTouchEventListener::OnTouchPressed(const _Control& source, const _T
 
        if (pEditPresenter->IsCopyPasteManagerExist())
        {
-               if (pEditPresenter->GetTextCompositionState())
-               {
-                       pEditPresenter->FinishTextComposition();
-               }
+               pEditPresenter->FinishTextComposition();
                if (pEditPresenter->IsCopyPastePopup(source))
                {
                        return false; // CopyPastePopup is touched
@@ -251,6 +248,7 @@ _Edit::_Edit(void)
        , __previousBounds()
        , __isTouchMoving(false)
        , __isSearchFieldFocused(false)
+       , __isTextEventEnabled(true)
 {
        for (int status = 0; status < EDIT_COLOR_MAX; status++)
        {
@@ -2723,7 +2721,7 @@ _Edit::SendTextEvent(CoreTextEventStatus textEventStatus)
                _pEditPresenter->DeleteFullscreenKeypad();
        }
 
-       if (__pTextEvent)
+       if (__pTextEvent && IsTextEventEnabled())
        {
                IEventArg* pEventArg = _TextEvent::CreateTextEventArgN(textEventStatus);
                SysTryReturn(NID_UI_CTRL, pEventArg, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory shortage.");
@@ -3400,4 +3398,17 @@ _Edit::IsPasswordVisible(void) const
        return _pEditPresenter->IsPasswordVisible();
 }
 
+void
+_Edit::SetTextEventEnabled(bool enable)
+{
+       __isTextEventEnabled = enable;
+       return;
+}
+
+bool
+_Edit::IsTextEventEnabled(void) const
+{
+       return __isTextEventEnabled;
+}
+
 }}} // Tizen::Ui::Controls

diff --git a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
index 3792f8d..84969db 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
+++ b/src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
@@ -925,11 +925,11 @@ _EditCopyPasteHandler::AdjustBounds(void)
                        else if (__handlerDirection == HANDLER_DIRECTION_REVERSE_2)
                        {
                                rect.x = rect.x - __pHandlerBitmap->GetWidthF();
-                               rect.y -= rect.height;
+                               rect.y -= (rect.height + cursorRect.height);
                        }
                        else if (__handlerDirection == HANDLER_DIRECTION_REVERSE_3)
                        {
-                               rect.y -= rect.height;
+                               rect.y -= (rect.height + cursorRect.height);
                        }
                }
                else
@@ -940,12 +940,12 @@ _EditCopyPasteHandler::AdjustBounds(void)
                        }
                        else if (__handlerDirection == HANDLER_DIRECTION_REVERSE_2)
                        {
-                               rect.y -= rect.height;
+                               rect.y -= (rect.height + cursorRect.height);
                        }
                        else if (__handlerDirection == HANDLER_DIRECTION_REVERSE_3)
                        {
                                rect.x = rect.x - __pHandlerBitmap->GetWidthF();
-                               rect.y -= rect.height;
+                               rect.y -= (rect.height + cursorRect.height);
                        }
                }
        }
@@ -1061,7 +1061,7 @@ _EditCopyPasteHandler::CheckReverseStatus(void)
                        if ((__handlerDirection == HANDLER_DIRECTION_NONE) && ((rect.y + rect.height) > screenSize.height))
                        {
                                __handlerDirection = HANDLER_DIRECTION_REVERSE_3;
-                               rect.y -= rect.height;
+                               rect.y -= (rect.height + cursorAbsBounds.height);
                        }
                        else if ((__handlerDirection == HANDLER_DIRECTION_NONE) && ((rect.y + rect.height) <= screenSize.height))
                        {
@@ -1074,7 +1074,7 @@ _EditCopyPasteHandler::CheckReverseStatus(void)
                        else if ((__handlerDirection == HANDLER_DIRECTION_REVERSE_2) && ((rect.y + 2*rect.height) <= screenSize.height))
                        {
                                __handlerDirection = HANDLER_DIRECTION_REVERSE_1;
-                               rect.y += rect.height;
+                               rect.y += (rect.height + cursorAbsBounds.height);
                        }
                        ChangeHandlerBitmap();
                        rect.x += rect.width;
@@ -1085,7 +1085,7 @@ _EditCopyPasteHandler::CheckReverseStatus(void)
                        if ((__handlerDirection == HANDLER_DIRECTION_REVERSE_1) && ((rect.y + rect.height) > screenSize.height))
                        {
                                __handlerDirection = HANDLER_DIRECTION_REVERSE_2;
-                               rect.y -= rect.height;
+                               rect.y -= (rect.height + cursorAbsBounds.height);
                        }
                        else if ((__handlerDirection == HANDLER_DIRECTION_REVERSE_1) && ((rect.y + rect.height) <= screenSize.height))
                        {
@@ -1098,7 +1098,7 @@ _EditCopyPasteHandler::CheckReverseStatus(void)
                        else if ((__handlerDirection == HANDLER_DIRECTION_REVERSE_3) && ((rect.y + 2*rect.height) <= screenSize.height))
                        {
                                __handlerDirection = HANDLER_DIRECTION_NONE;
-                               rect.y += rect.height;
+                               rect.y += (rect.height + cursorAbsBounds.height);
                        }
                        ChangeHandlerBitmap();
                        rect.x -= rect.width;
@@ -1124,11 +1124,11 @@ _EditCopyPasteHandler::CheckReverseStatus(void)
                        {
                                __handlerDirection = HANDLER_DIRECTION_REVERSE_3;
                        }
-                       rect.y -= rect.height;
+                       rect.y -= (rect.height + cursorAbsBounds.height);
                        ChangeHandlerBitmap();
                        __reverseCheck = true;
                }
-               else if (((__handlerDirection == HANDLER_DIRECTION_REVERSE_2) || (__handlerDirection == HANDLER_DIRECTION_REVERSE_3)) && ((rect.y + 2*rect.height) <= screenSize.height))
+               else if (((__handlerDirection == HANDLER_DIRECTION_REVERSE_2) || (__handlerDirection == HANDLER_DIRECTION_REVERSE_3)) && ((rect.y + 2*rect.height + cursorAbsBounds.height) <= screenSize.height))
                {
                        if ((__handlerDirection == HANDLER_DIRECTION_REVERSE_2) && rect.x < 0.0f)
                        {
@@ -1148,7 +1148,7 @@ _EditCopyPasteHandler::CheckReverseStatus(void)
                        {
                                __handlerDirection = HANDLER_DIRECTION_REVERSE_1;
                        }
-                       rect.y += rect.height;
+                       rect.y += (rect.height + cursorAbsBounds.height);
                        ChangeHandlerBitmap();
                        __reverseCheck = true;
                }
@@ -1160,7 +1160,7 @@ _EditCopyPasteHandler::CheckReverseStatus(void)
                        if ((__handlerDirection == HANDLER_DIRECTION_NONE) && ((rect.y + rect.height) > screenSize.height))
                        {
                                __handlerDirection = HANDLER_DIRECTION_REVERSE_3;
-                               rect.y -= rect.height;
+                               rect.y -= (rect.height + cursorAbsBounds.height);
                        }
                        else if ((__handlerDirection == HANDLER_DIRECTION_NONE) && ((rect.y + rect.height) <= screenSize.height))
                        {
@@ -1173,7 +1173,7 @@ _EditCopyPasteHandler::CheckReverseStatus(void)
                        else if ((__handlerDirection == HANDLER_DIRECTION_REVERSE_2) && ((rect.y + 2*rect.height) <= screenSize.height))
                        {
                                __handlerDirection = HANDLER_DIRECTION_REVERSE_1;
-                               rect.y += rect.height;
+                               rect.y += (rect.height + cursorAbsBounds.height);
                        }
                        ChangeHandlerBitmap();
                        rect.x -= rect.width;
@@ -1184,7 +1184,7 @@ _EditCopyPasteHandler::CheckReverseStatus(void)
                        if ((__handlerDirection == HANDLER_DIRECTION_REVERSE_1) && ((rect.y + rect.height) > screenSize.height))
                        {
                                __handlerDirection = HANDLER_DIRECTION_REVERSE_2;
-                               rect.y -= rect.height;
+                               rect.y -= (rect.height + cursorAbsBounds.height);
                        }
                        else if ((__handlerDirection == HANDLER_DIRECTION_REVERSE_1) && ((rect.y + rect.height) <= screenSize.height))
                        {
@@ -1197,7 +1197,7 @@ _EditCopyPasteHandler::CheckReverseStatus(void)
                        else if ((__handlerDirection == HANDLER_DIRECTION_REVERSE_3) && ((rect.y + 2*rect.height) <= screenSize.height))
                        {
                                __handlerDirection = HANDLER_DIRECTION_NONE;
-                               rect.y += rect.height;
+                               rect.y += (rect.height + cursorAbsBounds.height);
                        }
                        ChangeHandlerBitmap();
                        rect.x += rect.width;
@@ -1223,11 +1223,11 @@ _EditCopyPasteHandler::CheckReverseStatus(void)
                        {
                                __handlerDirection = HANDLER_DIRECTION_REVERSE_3;
                        }
-                       rect.y -= rect.height;
+                       rect.y -= (rect.height + cursorAbsBounds.height);
                        ChangeHandlerBitmap();
                        __reverseCheck = true;
                }
-               else if (((__handlerDirection == HANDLER_DIRECTION_REVERSE_2) || (__handlerDirection == HANDLER_DIRECTION_REVERSE_3)) && ((rect.y + 2*rect.height) <= screenSize.height))
+               else if (((__handlerDirection == HANDLER_DIRECTION_REVERSE_2) || (__handlerDirection == HANDLER_DIRECTION_REVERSE_3)) && ((rect.y + 2*rect.height + cursorAbsBounds.height) <= screenSize.height))
                {
                        if ((__handlerDirection == HANDLER_DIRECTION_REVERSE_2) && ((rect.x + rect.width) <= screenSize.width))
                        {
@@ -1247,7 +1247,7 @@ _EditCopyPasteHandler::CheckReverseStatus(void)
                        {
                                __handlerDirection = HANDLER_DIRECTION_REVERSE_1;
                        }
-                       rect.y += rect.height;
+                       rect.y += (rect.height + cursorAbsBounds.height);
                        ChangeHandlerBitmap();
                        __reverseCheck = true;
                }
@@ -1319,6 +1319,10 @@ _EditCopyPasteHandler::OnTouchMoved(const _Control& source, const _TouchInfo& to
        }
 
        FloatPoint absoluteTouchMovedPoint = FloatPoint(GetBoundsF().x + point.x, GetBoundsF().y + point.y);
+       if (__handlerDirection == HANDLER_DIRECTION_REVERSE_2 || __handlerDirection == HANDLER_DIRECTION_REVERSE_3)
+       {
+               absoluteTouchMovedPoint.y += (GetBoundsF().height + absCursorRect.height);
+       }
        if (__rowIndex == -1 && __columnIndex == -1)
        {
                pEditPresenter->CalculateCursorBounds(pEditPresenter->GetTextBoundsF(), cursorRect,__handlerCursorPos);

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index 52046d3..173bc48 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -353,12 +353,7 @@ _EditPresenter::OnInputConnectionPanelShowStateChanged(InputConnection& source,
                                        SetFooterVisible(true);// must be called ahead of DeflateClientRectHeight
                                }
 
-                               if ( __isTextComposing)
-                               {
-                                       __pInputConnection->FinishTextComposition();
-                                       __isTextComposing = false;
-                                       __composingTextLength = 0;
-                               }
+                               FinishTextComposition();
 
                                ChangeLayoutInternal(__pEdit->GetOrientation());
 
@@ -661,7 +656,14 @@ _EditPresenter::OnComposingTextChanged(const String& composingText, int cursorPo
 
        int textLength = composingText.GetLength();
 
-       if (__isTextComposing == true)
+       if (__isTextComposing == false)
+       {
+               if (textLength == 0)
+               {
+                       return;
+               }
+       }
+       else
        {
                int compositionStart = GetCursorPosition();
 
@@ -1971,7 +1973,8 @@ _EditPresenter::DrawTextBlockLine(Canvas& canvas)
        textObjectBounds.x -= 1;
        textObjectBounds.width = textObjectBounds.width + 2;
        CalculateCursorBounds(__textObjectBounds, cursorBounds, startRange);
-       Color textBlockLineColor(0x3B, 0x73, 0xB6);
+       Color textBlockLineColor;
+       GET_COLOR_CONFIG(EDIT::CURSOR_NORMAL, textBlockLineColor);
 
        if (cursorBounds.x != -1)
        {
@@ -3641,12 +3644,7 @@ _EditPresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
                switch (keyCode)
                {
                        case _KEY_A:
-                               if (__isInputConnectionBound && __isTextComposing)
-                               {
-                                       __pInputConnection->FinishTextComposition();
-                                       __isTextComposing = false;
-                                       __composingTextLength = 0;
-                               }
+                               FinishTextComposition();
 
                                if (__isCopyPasteManagerExist)
                                {
@@ -3848,12 +3846,7 @@ _EditPresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
                        InitializeCopyPasteManager();
                }
 
-               if (__isInputConnectionBound != false && __isTextComposing != false)
-               {
-                       __pInputConnection->FinishTextComposition();
-                       __isTextComposing = false;
-                       __composingTextLength = 0;
-               }
+               FinishTextComposition();
 
                int curCursorLine = __pTextObject->GetLineIndexAtTextIndex(__pTextObject->GetCursorIndex());
                int firstTextIndex = __pTextObject->GetFirstTextIndexAt(curCursorLine);
@@ -3959,12 +3952,7 @@ _EditPresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
                        InitializeCopyPasteManager();
                }
 
-               if (__isInputConnectionBound != false && __isTextComposing != false)
-               {
-                       __pInputConnection->FinishTextComposition();
-                       __isTextComposing = false;
-                       __composingTextLength = 0;
-               }
+               FinishTextComposition();
 
                if (__cursorPos != 0)
                {
@@ -4009,12 +3997,7 @@ _EditPresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
                        InitializeCopyPasteManager();
                }
 
-               if (__isInputConnectionBound != false && __isTextComposing != false)
-               {
-                       __pInputConnection->FinishTextComposition();
-                       __isTextComposing = false;
-                       __composingTextLength = 0;
-               }
+               FinishTextComposition();
 
                int curCursorLine = __pTextObject->GetLineIndexAtTextIndex(__pTextObject->GetCursorIndex());
                if (curCursorLine !=0 )
@@ -4071,12 +4054,7 @@ _EditPresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
                        InitializeCopyPasteManager();
                }
 
-               if (__isInputConnectionBound != false && __isTextComposing != false)
-               {
-                       __pInputConnection->FinishTextComposition();
-                       __isTextComposing = false;
-                       __composingTextLength = 0;
-               }
+               FinishTextComposition();
 
                int curCursorLine = __pTextObject->GetLineIndexAtTextIndex(__pTextObject->GetCursorIndex());
                int totalLine = __pTextObject->GetTotalLineCount();
@@ -4136,12 +4114,7 @@ _EditPresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
                        InitializeCopyPasteManager();
                }
 
-               if (__isInputConnectionBound != false && __isTextComposing != false)
-               {
-                       __pInputConnection->FinishTextComposition();
-                       __isTextComposing = false;
-                       __composingTextLength = 0;
-               }
+               FinishTextComposition();
 
                if (__cursorPos == GetTextLength())
                {
@@ -4214,12 +4187,7 @@ _EditPresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
                }
                else
                {
-                       if (__isInputConnectionBound && __isTextComposing)
-                       {
-                               __pInputConnection->FinishTextComposition();
-                               __isTextComposing = false;
-                               __composingTextLength = 0;
-                       }
+                       FinishTextComposition();
 
                        int cursorPosition = GetCursorPosition();
                        if ((__pEdit->GetEditStyle() & EDIT_STYLE_TOKEN) == false)
@@ -4311,12 +4279,7 @@ _EditPresenter::TranslateKeyEventInfo(const _Control& source, _KeyInfo& keyInfo)
                        InitializeCopyPasteManager();
                }
 
-               if (__isInputConnectionBound != false && __isTextComposing != false)
-               {
-                       __pInputConnection->FinishTextComposition();
-                       __isTextComposing = false;
-                       __composingTextLength = 0;
-               }
+               FinishTextComposition();
 
                int curCursorLine = __pTextObject->GetLineIndexAtTextIndex(__pTextObject->GetCursorIndex());
                int totalLine = __pTextObject->GetTotalLineCount();
@@ -4522,12 +4485,7 @@ _EditPresenter::OnLongPressGestureDetected(void)
                        return true;
                }
 
-               if (__isInputConnectionBound && __isTextComposing)
-               {
-                       __pInputConnection->FinishTextComposition();
-                       __isTextComposing = false;
-                       __composingTextLength = 0;
-               }
+               FinishTextComposition();
 
                int cursorPos = GetCursorPositionAt(__pressedPoint);
                if (cursorPos != -1)
@@ -4596,12 +4554,7 @@ _EditPresenter::OnTapGestureDetected(void)
                        }
                }
 
-               if (__isInputConnectionBound && __isTextComposing)
-               {
-                       __pInputConnection->FinishTextComposition();
-                       __isTextComposing = false;
-                       __composingTextLength = 0;
-               }
+               FinishTextComposition();
 
                GetWordPosition(cursorPos, start, end);
                SetBlockRange(start, end);
@@ -5155,12 +5108,7 @@ _EditPresenter::SetText(const String& text)
                SysTryReturnResult(NID_UI_CTRL, length <= __limitLength, E_INVALID_ARG, "The Invalid argument is given.");
        }
 
-       if (__isInputConnectionBound && __isTextComposing)
-       {
-               __pInputConnection->FinishTextComposition();
-               __isTextComposing = false;
-               __composingTextLength = 0;
-       }
+       FinishTextComposition();
 
        __pTextString->Clear();
        __pTextString->Append(text);
@@ -5179,6 +5127,8 @@ _EditPresenter::SetText(const String& text)
 
        ReplaceTextIntoPasswordHyphenString();
 
+       __pTextObject->NotifyTextChanged(__pTextBuffer, 0, __pTextString->GetLength(), 0);
+
        SetCursorPosition(length);
 
        if (__pEdit->GetEditStyle() & EDIT_STYLE_FLEXIBLE)
@@ -5450,12 +5400,7 @@ _EditPresenter::ClearText(void)
 
        result r = E_SUCCESS;
 
-       if (__isInputConnectionBound && __isTextComposing)
-       {
-               __pInputConnection->FinishTextComposition();
-               __isTextComposing = false;
-               __composingTextLength = 0;
-       }
+       FinishTextComposition();
 
        int textLength = GetTextLength();
 
@@ -6029,12 +5974,7 @@ _EditPresenter::InsertTextAt(int position, const String& text, const Bitmap& tex
                SysTryReturnResult(NID_UI_CTRL, totalLength <= __limitLength, E_MAX_EXCEEDED, "The text exceeds the limitation length.");
        }
 
-       if (__isInputConnectionBound == true && __isTextComposing == true)
-       {
-               __pInputConnection->FinishTextComposition();
-               __isTextComposing = false;
-               __composingTextLength = 0;
-       }
+       FinishTextComposition();
 
        r = __pTextString->Insert(text, position);
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -7626,11 +7566,10 @@ _EditPresenter::HideKeypad(bool focus)
                }
        }
 
-       __pInputConnection->FinishTextComposition();
+       FinishTextComposition();
        __pInputConnection->HideInputPanel();
        __pInputConnection->UnbindInputMethod();
-       __isTextComposing = false;
-       __composingTextLength = 0;
+
 
        if (__isKeypadExist)
        {
@@ -7815,9 +7754,8 @@ _EditPresenter::DrawCursor(Canvas& canvas, FloatRectangle& cursorBounds, bool is
 
        if (__isCursorDisabled == false)
        {
-//             Color cursorColor;
-//             GET_COLOR_CONFIG(EDIT::CURSOR_NORMAL, cursorColor);
-               Color cursorColor(0x3B, 0x73, 0xB6);
+               Color cursorColor;
+               GET_COLOR_CONFIG(EDIT::CURSOR_NORMAL, cursorColor);
 
                if (__isCursorInitialized)
                {
@@ -10323,11 +10261,13 @@ _EditPresenter::GetClearIconBoundsF(void) const
 void
 _EditPresenter::FinishTextComposition(void)
 {
-       if (__isInputConnectionBound)
+       if (__isInputConnectionBound && __isTextComposing)
        {
+               __pEdit->SetTextEventEnabled(false);
                __pInputConnection->FinishTextComposition();
                __isTextComposing = false;
                __composingTextLength = 0;
+               __pEdit->SetTextEventEnabled(true);
        }
 
        return;
@@ -11125,12 +11065,7 @@ _EditPresenter::SetPasswordVisible(bool visible)
 
        InitializeCopyPasteManager();
 
-       if (__isInputConnectionBound && __isTextComposing)
-       {
-               __pInputConnection->FinishTextComposition();
-               __isTextComposing = false;
-               __composingTextLength = 0;
-       }
+       FinishTextComposition();
 
        if (__isPasswordVisible)
        {

diff --git a/src/ui/controls/FUiCtrl_Form.cpp b/src/ui/controls/FUiCtrl_Form.cpp
index c96d88c..13504ce 100644 (file)
--- a/src/ui/controls/FUiCtrl_Form.cpp
+++ b/src/ui/controls/FUiCtrl_Form.cpp
@@ -84,6 +84,7 @@ _Form::_Form(void)
        , __updatedSoftkeyCount(0)
        , __keypadShowstate(false)
        , __clipboardShowstate(false)
+       , __alreadyStopKeySent(false)
        , __pFormOrientationstatusEventListener(null)
        , __pFocusControl(null)
        , __pFocusTraversalControl(null)
@@ -2664,8 +2665,12 @@ _Form::OnActionPerformed(const _Control& source, int actionId)
                {
                        if (__keypadShowstate)
                        {
-                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_PRESSED, _KEY_BACK);
-                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_RELEASED, _KEY_BACK);
+                               if (!__alreadyStopKeySent)
+                               {
+                                       _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_PRESSED, _KEY_BACK);
+                                       _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_RELEASED, _KEY_BACK);
+                                       __alreadyStopKeySent = true;
+                               }
                        }
 
                        if (__clipboardShowstate)
@@ -2966,6 +2971,11 @@ _Form::SetKeypadShowState(bool state)
 {
        __keypadShowstate = state;
 
+       if (!state)
+       {
+               __alreadyStopKeySent = false;
+       }
+
        if (__clipboardShowstate)
        {
                return;

diff --git a/src/ui/inc/FUiCtrl_Edit.h b/src/ui/inc/FUiCtrl_Edit.h
index 188aea7..667bb1e 100755 (executable)
--- a/src/ui/inc/FUiCtrl_Edit.h
+++ b/src/ui/inc/FUiCtrl_Edit.h
@@ -427,6 +427,9 @@ public:
        bool CheckKeypadExist(_ControlOrientation orientation);
        bool IsDestroyed(void) const;
        bool IsPasswordVisible(void) const;
+
+       void SetTextEventEnabled(bool enable);
+       bool IsTextEventEnabled(void) const;
        virtual void SetAutoShrinkModeEnabled(bool enable);
        virtual bool IsAutoShrinkModeEnabled(void) const;
 
@@ -562,6 +565,7 @@ private:
        Tizen::Graphics::FloatRectangle __previousBounds;
        bool __isTouchMoving;
        bool __isSearchFieldFocused;
+       bool __isTextEventEnabled;
 }; // _Edit
 
 }}} // Tizen::Ui::Controls

diff --git a/src/ui/inc/FUiCtrl_Form.h b/src/ui/inc/FUiCtrl_Form.h
index c8084a3..f1ad3e0 100644 (file)
--- a/src/ui/inc/FUiCtrl_Form.h
+++ b/src/ui/inc/FUiCtrl_Form.h
@@ -282,6 +282,7 @@ private:
        bool __showSoftkey[_SOFTKEY_COUNT + 1];
        bool __keypadShowstate;
        bool __clipboardShowstate;
+       bool __alreadyStopKeySent;
 
        Tizen::Base::String __softkeyText[_SOFTKEY_COUNT + 1];
 

diff --git a/src/ui/resource/FUi_ResourceEditConfig.cpp b/src/ui/resource/FUi_ResourceEditConfig.cpp
index 8d088c1..961c025 100644 (file)
--- a/src/ui/resource/FUi_ResourceEditConfig.cpp
+++ b/src/ui/resource/FUi_ResourceEditConfig.cpp
@@ -40,7 +40,7 @@ START_UI_CONFIG(EDIT);
        ADD_COLOR_CONFIG(CLEAR_ICON_PRESSED, $B042);
        ADD_COLOR_CONFIG(CUT_LINK_TEXT_NORMAL, $B052L5);
        ADD_COLOR_CONFIG(CUT_LINK_BG_NORMAL, $B0217);
-       ADD_COLOR_CONFIG(CURSOR_NORMAL, $F052);
+       ADD_COLOR_CONFIG(CURSOR_NORMAL, $F011L12);
 
        ADD_IMAGE_CONFIG(BG_NORMAL, #00_edit_field_no_line_square_bg.#.png);
        ADD_IMAGE_CONFIG(BG_PRESSED, #00_edit_field_no_line_square_bg.#.png);