X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller.cpp;h=23ade2b968caca000e7909fc3b546e37f99c88ee;hb=a7646628bf0d87a7f9e02d8f4db52dea881579c7;hp=e07e29cdf9cd0ff3b9c0bac04cb1aa01d9b67ed1;hpb=511ab5d892c68a8bbbc3846e85fc5ec8f7323470;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index e07e29c..23ade2b 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -73,12 +73,11 @@ void Controller::EnableTextInput( DecoratorPtr decorator ) void Controller::SetText( const std::string& text ) { - // Cancel previously queued inserts etc. - mImpl->mModifyEvents.clear(); - // Remove the previously set text ResetText(); + CharacterIndex lastCursorIndex = 0u; + if( !text.empty() ) { // Convert text into UTF-32 @@ -96,11 +95,8 @@ void Controller::SetText( const std::string& text ) DALI_ASSERT_DEBUG( text.size() >= characterCount && "Invalid UTF32 conversion length" ); DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SetText %p UTF8 size %d, UTF32 size %d\n", this, text.size(), mImpl->mLogicalModel->mText.Count() ); - // Reset the cursor position - if( mImpl->mEventData ) - { - mImpl->mEventData->mPrimaryCursorPosition = characterCount; - } + // To reset the cursor position + lastCursorIndex = characterCount; // Update the rest of the model during size negotiation mImpl->QueueModifyEvent( ModifyEvent::TEXT_REPLACED ); @@ -116,6 +112,12 @@ void Controller::SetText( const std::string& text ) ShowPlaceholderText(); } + // Resets the cursor position. + ResetCursorPosition( lastCursorIndex ); + + // Scrolls the text to make the cursor visible. + ResetScrollPosition(); + mImpl->RequestRelayout(); if( mImpl->mEventData ) @@ -126,6 +128,9 @@ void Controller::SetText( const std::string& text ) // Reset keyboard as text changed mImpl->ResetImfManager(); + + // Do this last since it provides callbacks into application code + mImpl->mControlInterface.TextChanged(); } void Controller::GetText( std::string& text ) const @@ -672,12 +677,6 @@ void Controller::ResetText() mImpl->mLogicalModel->mText.Clear(); ClearModelData(); - // Reset the cursor position - if( mImpl->mEventData ) - { - mImpl->mEventData->mPrimaryCursorPosition = 0; - } - // We have cleared everything including the placeholder-text mImpl->PlaceholderCleared(); @@ -688,6 +687,32 @@ void Controller::ResetText() mImpl->mOperationsPending = ALL_OPERATIONS; } +void Controller::ResetCursorPosition( CharacterIndex cursorIndex ) +{ + // Reset the cursor position + if( NULL != mImpl->mEventData ) + { + mImpl->mEventData->mPrimaryCursorPosition = cursorIndex; + + // Update the cursor if it's in editing mode. + if( ( EventData::EDITING == mImpl->mEventData->mState ) || + ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) ) + { + mImpl->mEventData->mUpdateCursorPosition = true; + } + } +} + +void Controller::ResetScrollPosition() +{ + if( NULL != mImpl->mEventData ) + { + // Reset the scroll position. + mImpl->mEventData->mScrollPosition = Vector2::ZERO; + mImpl->mEventData->mScrollAfterUpdateCursorPosition = true; + } +} + void Controller::TextReplacedEvent() { // Reset buffers. @@ -747,8 +772,7 @@ void Controller::TextDeletedEvent() REORDER ); // Queue a cursor reposition event; this must wait until after DoRelayout() - mImpl->mEventData->mUpdateCursorPosition = true; - mImpl->mEventData->mScrollAfterUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterDelete = true; } bool Controller::DoRelayout( const Size& size, @@ -868,17 +892,6 @@ bool Controller::DoRelayout( const Size& size, } } // REORDER - // TODO: I'm working on a patch that changes the LayoutEngine::Align() method. - // The layoutParameters is not needed and this call can be moved outside the if(). - // Then there is no need to do the layout again to change the alignment. - if( ALIGN & operations ) - { - mImpl->mLayoutEngine.Align( layoutParameters, - layoutSize, - lines, - glyphPositions ); - } - // Sets the actual size. if( UPDATE_ACTUAL_SIZE & operations ) { @@ -891,6 +904,17 @@ bool Controller::DoRelayout( const Size& size, layoutSize = mImpl->mVisualModel->GetActualSize(); } + if( ALIGN & operations ) + { + // The laid-out lines. + Vector& lines = mImpl->mVisualModel->mLines; + + mImpl->mLayoutEngine.Align( layoutSize, + lines ); + + viewUpdated = true; + } + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::DoRelayout, view updated %s\n", ( viewUpdated ? "true" : "false" ) ); return viewUpdated; } @@ -929,15 +953,7 @@ void Controller::SetHorizontalAlignment( LayoutEngine::HorizontalAlignment align mImpl->mLayoutEngine.SetHorizontalAlignment( alignment ); // Set the flag to redo the alignment operation. - // TODO : Is not needed re-layout and reorder again but with the current implementation it is. - // Im working on a different patch to fix an issue with the alignment. When that patch - // is in, this issue can be fixed. - const OperationsMask layoutOperations = static_cast( LAYOUT | - UPDATE_ACTUAL_SIZE | - ALIGN | - REORDER ); - - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | layoutOperations ); + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | ALIGN ); mImpl->RequestRelayout(); } @@ -1089,12 +1105,17 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) { DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyEvent" ); + bool textChanged( false ); + if( mImpl->mEventData && keyEvent.state == KeyEvent::Down ) { int keyCode = keyEvent.keyCode; const std::string& keyString = keyEvent.keyPressed; + // Hide the grab handle. + mImpl->mEventData->mDecorator->SetHandleActive( GRAB_HANDLE, false ); + // Pre-process to separate modifying events from non-modifying input events. if( Dali::DALI_KEY_ESCAPE == keyCode ) { @@ -1122,15 +1143,18 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) if( removed ) { - if( 0u == mImpl->mLogicalModel->mText.Count() ) + if( 0u != mImpl->mLogicalModel->mText.Count() || + !mImpl->IsPlaceholderAvailable() ) { - ShowPlaceholderText(); - mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); } else { - mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); + ShowPlaceholderText(); + mImpl->mEventData->mUpdateCursorPosition = true; } + + textChanged = true; } } else @@ -1141,6 +1165,8 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) mImpl->ClearPreEditFlag(); InsertText( keyString, COMMIT ); + + textChanged = true; } mImpl->ChangeState( EventData::EDITING ); // todo Confirm this is the best place to change the state of @@ -1148,6 +1174,12 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) mImpl->RequestRelayout(); } + if( textChanged ) + { + // Do this last since it provides callbacks into application code + mImpl->mControlInterface.TextChanged(); + } + return false; } @@ -1261,9 +1293,10 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "MaxLengthReached (%d)\n", mImpl->mLogicalModel->mText.Count() ); - mImpl->mControlInterface.MaxLengthReached(); - mImpl->ResetImfManager(); + + // Do this last since it provides callbacks into application code + mImpl->mControlInterface.MaxLengthReached(); } } @@ -1329,9 +1362,19 @@ void Controller::PanEvent( Gesture::State state, const Vector2& displacement ) } } -void Controller::HandleEvent( HandleType handleType, HandleState state, float x, float y ) +void Controller::GetTargetSize( Vector2& targetSize ) { - DALI_ASSERT_DEBUG( mImpl->mEventData && "Controller::HandleEvent. Unexpected HandleEvent" ); + targetSize = mImpl->mControlSize; +} + +void Controller::AddDecoration( Actor& actor ) +{ + mImpl->mControlInterface.AddDecoration( actor ); +} + +void Controller::DecorationEvent( HandleType handleType, HandleState state, float x, float y ) +{ + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected DecorationEvent" ); if( mImpl->mEventData ) { @@ -1432,6 +1475,9 @@ ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, cons { mImpl->mOperationsPending = ALL_OPERATIONS; mImpl->RequestRelayout(); + + // Do this last since it provides callbacks into application code + mImpl->mControlInterface.TextChanged(); } ImfManager::ImfCallbackData callbackData( update, cursorPosition, text, false ); @@ -1453,9 +1499,6 @@ void Controller::ShowPlaceholderText() mImpl->mEventData->mIsShowingPlaceholderText = true; - // Cancel previously queued inserts etc. - mImpl->mModifyEvents.clear(); - // Disable handles when showing place-holder text mImpl->mEventData->mDecorator->SetHandleActive( GRAB_HANDLE, false ); mImpl->mEventData->mDecorator->SetHandleActive( LEFT_SELECTION_HANDLE, false );