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=f1ee352454eb80cd1095301fa00eba4d126d28aa;hp=e07e29cdf9cd0ff3b9c0bac04cb1aa01d9b67ed1;hb=e0478f13851db6194bbc21d7a62789eb9355e391;hpb=eff9a302f2e5999932743f5d5341e315f627793e diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index e07e29c..f1ee352 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -47,6 +47,12 @@ const float MAX_FLOAT = std::numeric_limits::max(); const std::string EMPTY_STRING(""); +float ConvertToEven( float value ) +{ + int intValue(static_cast( value )); + return static_cast(intValue % 2 == 0) ? intValue : (intValue + 1); +} + } // namespace namespace Dali @@ -73,12 +79,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 +101,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 +118,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 +134,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 @@ -332,8 +343,7 @@ bool Controller::RemoveText( int cursorOffset, int numberOfChars ) numberOfChars = currentText.Count() - cursorIndex; } - if( cursorIndex >= 0 && - (cursorIndex + numberOfChars) <= currentText.Count() ) + if( (cursorIndex + numberOfChars) <= currentText.Count() ) { Vector::Iterator first = currentText.Begin() + cursorIndex; Vector::Iterator last = first + numberOfChars; @@ -529,6 +539,9 @@ Vector3 Controller::GetNaturalSize() DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetNaturalSize cached %f,%f,%f\n", naturalSize.x, naturalSize.y, naturalSize.z ); } + naturalSize.x = ConvertToEven( naturalSize.x ); + naturalSize.y = ConvertToEven( naturalSize.y ); + return naturalSize; } @@ -586,9 +599,9 @@ bool Controller::Relayout( const Size& size ) if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) ) { bool glyphsRemoved( false ); - if( 0u != mImpl->mVisualModel->GetNumberOfGlyphPositions() ) + if( 0u != mImpl->mVisualModel->mGlyphPositions.Count() ) { - mImpl->mVisualModel->SetGlyphPositions( NULL, 0u ); + mImpl->mVisualModel->mGlyphPositions.Clear(); glyphsRemoved = true; } // Not worth to relayout if width or height is equal to zero. @@ -672,12 +685,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 +695,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->mScrollAfterUpdatePosition = true; + } +} + void Controller::TextReplacedEvent() { // Reset buffers. @@ -725,7 +758,7 @@ void Controller::TextInsertedEvent() // Queue a cursor reposition event; this must wait until after DoRelayout() mImpl->mEventData->mUpdateCursorPosition = true; - mImpl->mEventData->mScrollAfterUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterUpdatePosition = true; } void Controller::TextDeletedEvent() @@ -747,8 +780,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, @@ -767,7 +799,7 @@ bool Controller::DoRelayout( const Size& size, // after the first time the text has been laid out. // Fill the vectors again. - Length numberOfGlyphs = mImpl->mVisualModel->GetNumberOfGlyphs(); + Length numberOfGlyphs = mImpl->mVisualModel->mGlyphs.Count(); if( 0u == numberOfGlyphs ) { @@ -827,7 +859,7 @@ bool Controller::DoRelayout( const Size& size, if( 0u != bidirectionalInfo.Count() ) { // Get the lines - const Length numberOfLines = mImpl->mVisualModel->GetNumberOfLines(); + const Length numberOfLines = mImpl->mVisualModel->mLines.Count(); // Reorder the lines. Vector lineBidirectionalInfoRuns; @@ -868,17 +900,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 +912,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 +961,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 +1113,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 +1151,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 +1173,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 +1182,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; } @@ -1164,14 +1204,20 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ Vector utf32Characters; Length characterCount( 0u ); - if( ! text.empty() ) + // Remove the previous IMF pre-edit (predicitive text) + if( mImpl->mEventData && + mImpl->mEventData->mPreEditFlag && + 0 != mImpl->mEventData->mPreEditLength ) { - // The placeholder text is no longer needed - if( mImpl->IsShowingPlaceholderText() ) - { - ResetText(); - } + CharacterIndex offset = mImpl->mEventData->mPrimaryCursorPosition - mImpl->mEventData->mPreEditStartPosition; + removedPreEdit = RemoveText( -static_cast(offset), mImpl->mEventData->mPreEditLength ); + + mImpl->mEventData->mPrimaryCursorPosition = mImpl->mEventData->mPreEditStartPosition; + mImpl->mEventData->mPreEditLength = 0; + } + if( ! text.empty() ) + { // Convert text into UTF-32 utf32Characters.Resize( text.size() ); @@ -1187,22 +1233,17 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "UTF8 size %d, UTF32 size %d\n", text.size(), utf32Characters.Count() ); } - if( 0u != utf32Characters.Count() ) + if( 0u != utf32Characters.Count() ) // Check if Utf8ToUtf32 conversion succeeded { + // The placeholder text is no longer needed + if( mImpl->IsShowingPlaceholderText() ) + { + ResetText(); + } + // Handle the IMF (predicitive text) state changes if( mImpl->mEventData ) { - if( mImpl->mEventData->mPreEditFlag && - 0 != mImpl->mEventData->mPreEditLength ) - { - // Remove previous pre-edit text - CharacterIndex offset = mImpl->mEventData->mPrimaryCursorPosition - mImpl->mEventData->mPreEditStartPosition; - removedPreEdit = RemoveText( -static_cast(offset), mImpl->mEventData->mPreEditLength ); - - mImpl->mEventData->mPrimaryCursorPosition = mImpl->mEventData->mPreEditStartPosition; - mImpl->mEventData->mPreEditLength = 0; - } - if( COMMIT == type ) { // IMF manager is no longer handling key-events @@ -1225,7 +1266,7 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ } } - const Length numberOfCharactersInModel = mImpl->mLogicalModel->GetNumberOfCharacters(); + const Length numberOfCharactersInModel = mImpl->mLogicalModel->mText.Count(); // Restrict new text to fit within Maximum characters setting Length maxSizeOfNewText = std::min ( ( mImpl->mMaximumNumberOfCharacters - numberOfCharactersInModel ), characterCount ); @@ -1250,8 +1291,16 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Inserted %d characters, new size %d new cursor %d\n", maxSizeOfNewText, mImpl->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition ); } - if( removedPreEdit || - 0 != utf32Characters.Count() ) + if( 0u == mImpl->mLogicalModel->mText.Count() && + mImpl->IsPlaceholderAvailable() ) + { + // Show place-holder if empty after removing the pre-edit text + ShowPlaceholderText(); + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->ClearPreEditFlag(); + } + else if( removedPreEdit || + 0 != utf32Characters.Count() ) { // Queue an inserted event mImpl->QueueModifyEvent( ModifyEvent::TEXT_INSERTED ); @@ -1261,9 +1310,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(); } } @@ -1273,42 +1323,39 @@ void Controller::TapEvent( unsigned int tapCount, float x, float y ) if( NULL != mImpl->mEventData ) { + const bool isShowingPlaceholderText = mImpl->IsShowingPlaceholderText(); if( 1u == tapCount ) { bool tapDuringEditMode( EventData::EDITING == mImpl->mEventData->mState ); - if( ! mImpl->IsShowingPlaceholderText() && - EventData::EDITING == mImpl->mEventData->mState ) + if( !isShowingPlaceholderText && tapDuringEditMode ) { - // Grab handle is not shown until a tap is received whilst EDITING - if( tapDuringEditMode ) - { - mImpl->mEventData->mDecorator->SetHandleActive( GRAB_HANDLE, true ); - } + mImpl->mEventData->mDecorator->SetHandleActive( GRAB_HANDLE, true ); mImpl->mEventData->mDecorator->SetPopupActive( false ); } mImpl->ChangeState( EventData::EDITING ); + + // Handles & cursors must be repositioned after Relayout() i.e. after the Model has been updated + if( mImpl->mEventData ) + { + Event event( Event::TAP_EVENT ); + event.p1.mUint = tapCount; + event.p2.mFloat = x; + event.p3.mFloat = y; + mImpl->mEventData->mEventQueue.push_back( event ); + + mImpl->RequestRelayout(); + } } - else if( mImpl->mEventData->mSelectionEnabled && + else if( !isShowingPlaceholderText && + mImpl->mEventData->mSelectionEnabled && ( 2u == tapCount ) ) { - mImpl->ChangeState( EventData::SELECTING ); + SelectEvent( x, y, false ); } } - // Handles & cursors must be repositioned after Relayout() i.e. after the Model has been updated - if( mImpl->mEventData ) - { - Event event( Event::TAP_EVENT ); - event.p1.mUint = tapCount; - event.p2.mFloat = x; - event.p3.mFloat = y; - mImpl->mEventData->mEventQueue.push_back( event ); - - mImpl->RequestRelayout(); - } - // Reset keyboard as tap event has occurred. mImpl->ResetImfManager(); } @@ -1329,9 +1376,49 @@ void Controller::PanEvent( Gesture::State state, const Vector2& displacement ) } } -void Controller::HandleEvent( HandleType handleType, HandleState state, float x, float y ) +void Controller::SelectEvent( float x, float y, bool selectAll ) +{ + if( mImpl->mEventData ) + { + if ( mImpl->mEventData->mState == EventData::SELECTING ) + { + mImpl->ChangeState( EventData::SELECTION_CHANGED ); + } + else + { + mImpl->ChangeState( EventData::SELECTING ); + } + + if( selectAll ) + { + Event event( Event::SELECT_ALL ); + mImpl->mEventData->mEventQueue.push_back( event ); + } + else + { + Event event( Event::SELECT ); + event.p2.mFloat = x; + event.p3.mFloat = y; + mImpl->mEventData->mEventQueue.push_back( event ); + } + + mImpl->RequestRelayout(); + } +} + +void Controller::GetTargetSize( Vector2& targetSize ) { - DALI_ASSERT_DEBUG( mImpl->mEventData && "Controller::HandleEvent. Unexpected HandleEvent" ); + targetSize = mImpl->mControlSize; +} + +void Controller::AddDecoration( Actor& actor, bool needsClipping ) +{ + mImpl->mControlInterface.AddDecoration( actor, needsClipping ); +} + +void Controller::DecorationEvent( HandleType handleType, HandleState state, float x, float y ) +{ + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected DecorationEvent" ); if( mImpl->mEventData ) { @@ -1377,6 +1464,77 @@ void Controller::HandleEvent( HandleType handleType, HandleState state, float x, } } +void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Buttons button ) +{ + if( NULL == mImpl->mEventData ) + { + return; + } + + switch( button ) + { + case Toolkit::TextSelectionPopup::CUT: + { + mImpl->SendSelectionToClipboard( true ); // Synchronous call to modify text + mImpl->mOperationsPending = ALL_OPERATIONS; + if( 0u != mImpl->mLogicalModel->mText.Count() || + !mImpl->IsPlaceholderAvailable() ) + { + mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); + } + else + { + ShowPlaceholderText(); + mImpl->mEventData->mUpdateCursorPosition = true; + } + mImpl->RequestRelayout(); + mImpl->mControlInterface.TextChanged(); + break; + } + case Toolkit::TextSelectionPopup::COPY: + { + mImpl->SendSelectionToClipboard( false ); // Text not modified + mImpl->RequestRelayout(); // Handles, Selection Highlight, Popup + break; + } + case Toolkit::TextSelectionPopup::PASTE: + { + std::string stringToPaste(""); + mImpl->GetTextFromClipboard( 0, stringToPaste ); // Paste latest item from system clipboard + InsertText( stringToPaste, Text::Controller::CLIPBOARD ); + mImpl->ChangeState( EventData::EDITING ); + mImpl->RequestRelayout(); + break; + } + case Toolkit::TextSelectionPopup::SELECT: + { + const Vector2& currentCursorPosition = mImpl->mEventData->mDecorator->GetPosition( PRIMARY_CURSOR ); + + if( mImpl->mEventData->mSelectionEnabled ) + { + // Creates a SELECT event. + SelectEvent( currentCursorPosition.x, currentCursorPosition.y, false ); + } + break; + } + case Toolkit::TextSelectionPopup::SELECT_ALL: + { + // Creates a SELECT_ALL event + SelectEvent( 0.f, 0.f, true ); + break; + } + case Toolkit::TextSelectionPopup::CLIPBOARD: + { + break; + } + case Toolkit::TextSelectionPopup::NONE: + { + // Nothing to do. + break; + } + } +} + ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent ) { bool update( false ); @@ -1432,6 +1590,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 +1614,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 );