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.cpp;h=36b566b7052626c1fc34932c8f2b641c9a7d97cf;hp=adf4e75f11ceef1068266a344cbe9b6916dca9d6;hb=2a9ea91b7a05e1cf6d50e08425a7607bebab099f;hpb=7a24e2759c8627d8b77e1472d207739ab5677ebe diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index adf4e75..36b566b 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -73,13 +73,12 @@ 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(); - if( ! text.empty() ) + CharacterIndex lastCursorIndex = 0u; + + if( !text.empty() ) { // Convert text into UTF-32 Vector& utf32Characters = mImpl->mLogicalModel->mText; @@ -96,20 +95,31 @@ 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 ); + + // The natural size needs to be re-calculated. + mImpl->mRecalculateNaturalSize = true; + + // Apply modifications to the model + mImpl->mOperationsPending = ALL_OPERATIONS; } else { ShowPlaceholderText(); } + // Resets the cursor position. + ResetCursorPosition( lastCursorIndex ); + + // Scrolls the text to make the cursor visible. + ResetScrollPosition(); + + mImpl->RequestRelayout(); + if( mImpl->mEventData ) { // Cancel previously queued events @@ -118,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 @@ -285,9 +298,11 @@ void Controller::SetTextColor( const Vector4& textColor ) { mImpl->mTextColor = textColor; - if( ! mImpl->IsShowingPlaceholderText() ) + if( !mImpl->IsShowingPlaceholderText() ) { mImpl->mVisualModel->SetTextColor( textColor ); + + mImpl->RequestRelayout(); } } @@ -351,6 +366,7 @@ void Controller::SetPlaceholderTextColor( const Vector4& textColor ) if( mImpl->IsShowingPlaceholderText() ) { mImpl->mVisualModel->SetTextColor( textColor ); + mImpl->RequestRelayout(); } } @@ -367,6 +383,8 @@ const Vector4& Controller::GetPlaceholderTextColor() const void Controller::SetShadowOffset( const Vector2& shadowOffset ) { mImpl->mVisualModel->SetShadowOffset( shadowOffset ); + + mImpl->RequestRelayout(); } const Vector2& Controller::GetShadowOffset() const @@ -377,6 +395,8 @@ const Vector2& Controller::GetShadowOffset() const void Controller::SetShadowColor( const Vector4& shadowColor ) { mImpl->mVisualModel->SetShadowColor( shadowColor ); + + mImpl->RequestRelayout(); } const Vector4& Controller::GetShadowColor() const @@ -387,6 +407,8 @@ const Vector4& Controller::GetShadowColor() const void Controller::SetUnderlineColor( const Vector4& color ) { mImpl->mVisualModel->SetUnderlineColor( color ); + + mImpl->RequestRelayout(); } const Vector4& Controller::GetUnderlineColor() const @@ -397,6 +419,8 @@ const Vector4& Controller::GetUnderlineColor() const void Controller::SetUnderlineEnabled( bool enabled ) { mImpl->mVisualModel->SetUnderlineEnabled( enabled ); + + mImpl->RequestRelayout(); } bool Controller::IsUnderlineEnabled() const @@ -407,6 +431,8 @@ bool Controller::IsUnderlineEnabled() const void Controller::SetUnderlineHeight( float height ) { mImpl->mVisualModel->SetUnderlineHeight( height ); + + mImpl->RequestRelayout(); } float Controller::GetUnderlineHeight() const @@ -651,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(); @@ -667,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. @@ -847,6 +893,9 @@ 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, @@ -871,6 +920,86 @@ bool Controller::DoRelayout( const Size& size, return viewUpdated; } +void Controller::SetMultiLineEnabled( bool enable ) +{ + const LayoutEngine::Layout layout = enable ? LayoutEngine::MULTI_LINE_BOX : LayoutEngine::SINGLE_LINE_BOX; + + if( layout != mImpl->mLayoutEngine.GetLayout() ) + { + // Set the layout type. + mImpl->mLayoutEngine.SetLayout( layout ); + + // Set the flags to redo the layout operations + const OperationsMask layoutOperations = static_cast( LAYOUT | + UPDATE_ACTUAL_SIZE | + ALIGN | + REORDER ); + + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | layoutOperations ); + + mImpl->RequestRelayout(); + } +} + +bool Controller::IsMultiLineEnabled() const +{ + return LayoutEngine::MULTI_LINE_BOX == mImpl->mLayoutEngine.GetLayout(); +} + +void Controller::SetHorizontalAlignment( LayoutEngine::HorizontalAlignment alignment ) +{ + if( alignment != mImpl->mLayoutEngine.GetHorizontalAlignment() ) + { + // Set the alignment. + 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->RequestRelayout(); + } +} + +LayoutEngine::HorizontalAlignment Controller::GetHorizontalAlignment() const +{ + return mImpl->mLayoutEngine.GetHorizontalAlignment(); +} + +void Controller::SetVerticalAlignment( LayoutEngine::VerticalAlignment alignment ) +{ + if( alignment != mImpl->mLayoutEngine.GetVerticalAlignment() ) + { + // Set the alignment. + mImpl->mLayoutEngine.SetVerticalAlignment( 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->RequestRelayout(); + } +} + +LayoutEngine::VerticalAlignment Controller::GetVerticalAlignment() const +{ + return mImpl->mLayoutEngine.GetVerticalAlignment(); +} + void Controller::CalculateTextAlignment( const Size& size ) { // Get the direction of the first character. @@ -985,6 +1114,8 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) { DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyEvent" ); + bool textChanged( false ); + if( mImpl->mEventData && keyEvent.state == KeyEvent::Down ) { @@ -1027,6 +1158,8 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) { mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); } + + textChanged = true; } } else @@ -1037,6 +1170,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 @@ -1044,6 +1179,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; } @@ -1157,9 +1298,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(); } } @@ -1225,9 +1367,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 ) { @@ -1273,6 +1425,72 @@ void Controller::HandleEvent( HandleType handleType, HandleState state, float x, } } +ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent ) +{ + bool update( false ); + bool requestRelayout = false; + + std::string text; + unsigned int cursorPosition( 0 ); + + switch ( imfEvent.eventName ) + { + case ImfManager::COMMIT: + { + InsertText( imfEvent.predictiveString, Text::Controller::COMMIT ); + requestRelayout = true; + break; + } + case ImfManager::PREEDIT: + { + InsertText( imfEvent.predictiveString, Text::Controller::PRE_EDIT ); + update = true; + requestRelayout = true; + break; + } + case ImfManager::DELETESURROUNDING: + { + RemoveText( imfEvent.cursorOffset, imfEvent.numberOfChars ); + requestRelayout = true; + break; + } + case ImfManager::GETSURROUNDING: + { + GetText( text ); + cursorPosition = GetLogicalCursorPosition(); + + imfManager.SetSurroundingText( text ); + imfManager.SetCursorPosition( cursorPosition ); + break; + } + case ImfManager::VOID: + { + // do nothing + break; + } + } // end switch + + if( ImfManager::GETSURROUNDING != imfEvent.eventName ) + { + GetText( text ); + cursorPosition = GetLogicalCursorPosition(); + } + + if( requestRelayout ) + { + 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 ); + + return callbackData; +} + + Controller::~Controller() { delete mImpl; @@ -1286,9 +1504,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 ); @@ -1335,6 +1550,8 @@ void Controller::ShowPlaceholderText() // Apply modifications to the model mImpl->mOperationsPending = ALL_OPERATIONS; + + // Update the rest of the model during size negotiation mImpl->QueueModifyEvent( ModifyEvent::TEXT_REPLACED ); } }