X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller-event-handler.cpp;h=1d4be23d20f06ae7e9c70554ddab1790864c9b0a;hp=bf677e57618da1ab76c57db9dd36239b3d3cac7f;hb=bee78157f19fa54ae961081782a2f6537cc8dd5a;hpb=d75bd90eefea3cac2142fb8dba0aedf1bcbdc86f diff --git a/dali-toolkit/internal/text/text-controller-event-handler.cpp b/dali-toolkit/internal/text/text-controller-event-handler.cpp index bf677e5..1d4be23 100644 --- a/dali-toolkit/internal/text/text-controller-event-handler.cpp +++ b/dali-toolkit/internal/text/text-controller-event-handler.cpp @@ -26,6 +26,8 @@ // INTERNAL INCLUDES #include #include +#include +#include #include namespace @@ -66,7 +68,7 @@ void Controller::EventHandler::KeyboardFocusGainEvent(Controller& controller) if(controller.mImpl->IsShowingPlaceholderText()) { // Show alternative placeholder-text when editing - controller.ShowPlaceholderText(); + PlaceholderHandler::ShowPlaceholderText(*controller.mImpl); } controller.mImpl->RequestRelayout(); @@ -102,7 +104,7 @@ void Controller::EventHandler::KeyboardFocusLostEvent(Controller& controller) if(!controller.mImpl->IsShowingRealText()) { // Revert to regular placeholder-text when not editing - controller.ShowPlaceholderText(); + PlaceholderHandler::ShowPlaceholderText(*controller.mImpl); } } } @@ -115,6 +117,7 @@ bool Controller::EventHandler::KeyEvent(Controller& controller, const Dali::KeyE bool textChanged = false; bool relayoutNeeded = false; + bool isEditable = controller.IsEditable() && controller.IsUserInteractionEnabled(); if((NULL != controller.mImpl->mEventData) && (keyEvent.GetState() == KeyEvent::DOWN)) @@ -146,7 +149,7 @@ bool Controller::EventHandler::KeyEvent(Controller& controller, const Dali::KeyE (Dali::DALI_KEY_CURSOR_DOWN == keyCode)) { // If don't have any text, do nothing. - if(!controller.mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters) + if(!controller.mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters || !isEditable) { return false; } @@ -205,7 +208,7 @@ bool Controller::EventHandler::KeyEvent(Controller& controller, const Dali::KeyE // Do nothing return false; } - else if(keyEvent.IsCtrlModifier() && !keyEvent.IsShiftModifier()) + else if(keyEvent.IsCtrlModifier() && !keyEvent.IsShiftModifier() && isEditable) { bool consumed = false; if(keyName == KEY_C_NAME || keyName == KEY_INSERT_NAME || logicalKey == KEY_C_NAME || logicalKey == KEY_INSERT_NAME) @@ -237,7 +240,7 @@ bool Controller::EventHandler::KeyEvent(Controller& controller, const Dali::KeyE else if((Dali::DALI_KEY_BACKSPACE == keyCode) || (Dali::DevelKey::DALI_KEY_DELETE == keyCode)) { - textChanged = controller.DeleteEvent(keyCode); + textChanged = DeleteEvent(controller, keyCode); // Will request for relayout. relayoutNeeded = true; @@ -271,7 +274,7 @@ bool Controller::EventHandler::KeyEvent(Controller& controller, const Dali::KeyE else { DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::KeyEvent %p keyString %s\n", &controller, keyString.c_str()); - if(!controller.IsEditable()) return false; + if(!isEditable) return false; std::string refinedKey = keyString; if(controller.mImpl->mInputFilter != NULL && !refinedKey.empty()) @@ -302,7 +305,7 @@ bool Controller::EventHandler::KeyEvent(Controller& controller, const Dali::KeyE // InputMethodContext is no longer handling key-events controller.mImpl->ClearPreEditFlag(); - controller.InsertText(refinedKey, COMMIT); + TextUpdater::InsertText(controller, refinedKey, COMMIT); textChanged = true; @@ -419,7 +422,7 @@ void Controller::EventHandler::TapEvent(Controller& controller, unsigned int tap if(controller.mImpl->IsShowingPlaceholderText() && !controller.mImpl->IsFocusedPlaceholderAvailable()) { // Hide placeholder text - controller.ResetText(); + TextUpdater::ResetText(controller); } if(EventData::INACTIVE == state) @@ -598,18 +601,18 @@ void Controller::EventHandler::ProcessModifyEvents(Controller& controller) // A (single) replace event should come first, otherwise we wasted time processing NOOP events DALI_ASSERT_DEBUG(it == events.Begin() && "Unexpected TEXT_REPLACED event"); - controller.TextReplacedEvent(); + TextReplacedEvent(controller); } else if(ModifyEvent::TEXT_INSERTED == event.type) { - controller.TextInsertedEvent(); + TextInsertedEvent(controller); } else if(ModifyEvent::TEXT_DELETED == event.type) { // Placeholder-text cannot be deleted if(!controller.mImpl->IsShowingPlaceholderText()) { - controller.TextDeletedEvent(); + TextDeletedEvent(controller); } } } @@ -711,22 +714,18 @@ bool Controller::EventHandler::DeleteEvent(Controller& controller, int keyCode) if(EventData::SELECTING == controller.mImpl->mEventData->mState) { - removed = controller.RemoveSelectedText(); + removed = TextUpdater::RemoveSelectedText(controller); } else if((controller.mImpl->mEventData->mPrimaryCursorPosition > 0) && (keyCode == Dali::DALI_KEY_BACKSPACE)) { // Remove the character before the current cursor position - removed = controller.RemoveText(-1, - 1, - UPDATE_INPUT_STYLE); + removed = TextUpdater::RemoveText(controller, -1, 1, UPDATE_INPUT_STYLE); } else if((controller.mImpl->mEventData->mPrimaryCursorPosition < controller.mImpl->mModel->mLogicalModel->mText.Count()) && (keyCode == Dali::DevelKey::DALI_KEY_DELETE)) { // Remove the character after the current cursor position - removed = controller.RemoveText(0, - 1, - UPDATE_INPUT_STYLE); + removed = TextUpdater::RemoveText(controller, 0, 1, UPDATE_INPUT_STYLE); } if(removed) @@ -738,7 +737,7 @@ bool Controller::EventHandler::DeleteEvent(Controller& controller, int keyCode) } else { - controller.ShowPlaceholderText(); + PlaceholderHandler::ShowPlaceholderText(*controller.mImpl); } controller.mImpl->mEventData->mUpdateCursorPosition = true; controller.mImpl->mEventData->mScrollAfterDelete = true; @@ -760,23 +759,24 @@ InputMethodContext::CallbackData Controller::EventHandler::OnInputMethodContextE { case InputMethodContext::COMMIT: { - controller.InsertText(inputMethodContextEvent.predictiveString, Text::Controller::COMMIT); + TextUpdater::InsertText(controller, inputMethodContextEvent.predictiveString, Text::Controller::COMMIT); requestRelayout = true; retrieveCursor = true; break; } case InputMethodContext::PRE_EDIT: { - controller.InsertText(inputMethodContextEvent.predictiveString, Text::Controller::PRE_EDIT); + TextUpdater::InsertText(controller, inputMethodContextEvent.predictiveString, Text::Controller::PRE_EDIT); requestRelayout = true; retrieveCursor = true; break; } case InputMethodContext::DELETE_SURROUNDING: { - const bool textDeleted = controller.RemoveText(inputMethodContextEvent.cursorOffset, - inputMethodContextEvent.numberOfChars, - DONT_UPDATE_INPUT_STYLE); + const bool textDeleted = TextUpdater::RemoveText(controller, + inputMethodContextEvent.cursorOffset, + inputMethodContextEvent.numberOfChars, + DONT_UPDATE_INPUT_STYLE); if(textDeleted) { @@ -787,7 +787,7 @@ InputMethodContext::CallbackData Controller::EventHandler::OnInputMethodContextE } else { - controller.ShowPlaceholderText(); + PlaceholderHandler::ShowPlaceholderText(*controller.mImpl); } controller.mImpl->mEventData->mUpdateCursorPosition = true; controller.mImpl->mEventData->mScrollAfterDelete = true; @@ -809,6 +809,21 @@ InputMethodContext::CallbackData Controller::EventHandler::OnInputMethodContextE retrieveCursor = true; break; } + case InputMethodContext::SELECTION_SET: + { + uint32_t start = static_cast(inputMethodContextEvent.startIndex); + uint32_t end = static_cast(inputMethodContextEvent.endIndex); + if(start == end) + { + controller.SetPrimaryCursorPosition(start, true); + } + else + { + controller.SelectText(start, end); + } + + break; + } case InputMethodContext::VOID: { // do nothing @@ -882,7 +897,7 @@ void Controller::EventHandler::PasteClipboardItemEvent(Controller& controller) controller.mImpl->SetClipboardHideEnable(false); // Paste - controller.PasteText(stringToPaste); + TextUpdater::PasteText(controller, stringToPaste); controller.mImpl->SetClipboardHideEnable(true); } @@ -952,43 +967,17 @@ void Controller::EventHandler::TextPopupButtonTouched(Controller& controller, Da { case Toolkit::TextSelectionPopup::CUT: { - if(!controller.IsEditable()) return; - controller.mImpl->SendSelectionToClipboard(true); // Synchronous call to modify text - controller.mImpl->mOperationsPending = ALL_OPERATIONS; - - if((0u != controller.mImpl->mModel->mLogicalModel->mText.Count()) || - !controller.mImpl->IsPlaceholderAvailable()) - { - controller.mImpl->QueueModifyEvent(ModifyEvent::TEXT_DELETED); - } - else - { - controller.ShowPlaceholderText(); - } - - controller.mImpl->mEventData->mUpdateCursorPosition = true; - controller.mImpl->mEventData->mScrollAfterDelete = true; - - controller.mImpl->RequestRelayout(); - - if(NULL != controller.mImpl->mEditableControlInterface) - { - controller.mImpl->mEditableControlInterface->TextChanged(true); - } + controller.CutText(); break; } case Toolkit::TextSelectionPopup::COPY: { - controller.mImpl->SendSelectionToClipboard(false); // Text not modified - - controller.mImpl->mEventData->mUpdateCursorPosition = true; - - controller.mImpl->RequestRelayout(); // Cursor, Handles, Selection Highlight, Popup + controller.CopyText(); break; } case Toolkit::TextSelectionPopup::PASTE: { - controller.mImpl->RequestGetTextFromClipboard(); // Request clipboard service to retrieve an item + controller.PasteText(); break; } case Toolkit::TextSelectionPopup::SELECT: @@ -998,14 +987,14 @@ void Controller::EventHandler::TextPopupButtonTouched(Controller& controller, Da if(controller.mImpl->mEventData->mSelectionEnabled) { // Creates a SELECT event. - controller.SelectEvent(currentCursorPosition.x, currentCursorPosition.y, SelectionType::INTERACTIVE); + SelectEvent(controller, currentCursorPosition.x, currentCursorPosition.y, SelectionType::INTERACTIVE); } break; } case Toolkit::TextSelectionPopup::SELECT_ALL: { // Creates a SELECT_ALL event - controller.SelectEvent(0.f, 0.f, SelectionType::ALL); + SelectEvent(controller, 0.f, 0.f, SelectionType::ALL); break; } case Toolkit::TextSelectionPopup::CLIPBOARD: