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=09a444138b80ad7c5dc855a885eb7241e583869e;hp=c92aab859e31eb2e5ea17a73a3e428191699fef7;hb=677d489c37efac76c7449f7e22d66b3fc92c4af1;hpb=b9f461d2ec1241a63cd866524aaf422b94f057ae diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index c92aab8..09a4441 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -132,6 +132,55 @@ bool Controller::IsMarkupProcessorEnabled() const return mImpl->mMarkupProcessorEnabled; } +void Controller::SetAutoScrollEnabled( bool enable ) +{ + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled[%s] SingleBox[%s]-> [%p]\n", (enable)?"true":"false", ( mImpl->mLayoutEngine.GetLayout() == LayoutEngine::SINGLE_LINE_BOX)?"true":"false", this ); + + if ( mImpl->mLayoutEngine.GetLayout() == LayoutEngine::SINGLE_LINE_BOX ) + { + if ( enable ) + { + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled for SINGLE_LINE_BOX\n" ); + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | + LAYOUT | + ALIGN | + UPDATE_ACTUAL_SIZE | + UPDATE_DIRECTION | + REORDER ); + + } + else + { + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled Disabling autoscroll\n"); + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | + LAYOUT | + ALIGN | + UPDATE_ACTUAL_SIZE | + REORDER ); + } + + mImpl->mAutoScrollEnabled = enable; + mImpl->RequestRelayout(); + } + else + { + DALI_LOG_WARNING( "Attempted AutoScrolling on a non SINGLE_LINE_BOX, request ignored" ); + mImpl->mAutoScrollEnabled = false; + } +} + +bool Controller::IsAutoScrollEnabled() const +{ + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::IsAutoScrollEnabled[%s]\n", (mImpl->mAutoScrollEnabled)?"true":"false" ); + + return mImpl->mAutoScrollEnabled; +} + +CharacterDirection Controller::GetAutoScrollDirection() const +{ + return mImpl->mAutoScrollDirectionRTL; +} + void Controller::SetText( const std::string& text ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SetText\n" ); @@ -473,7 +522,7 @@ float Controller::GetDefaultPointSize() const void Controller::UpdateAfterFontChange( const std::string& newDefaultFont ) { - DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange"); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::UpdateAfterFontChange"); if( !mImpl->mFontDefaults->familyDefined ) // If user defined font then should not update when system font changes { @@ -565,6 +614,8 @@ bool Controller::RemoveText( int cursorOffset, // Cursor position retreat oldCursorIndex = cursorIndex; + mImpl->mEventData->mScrollAfterDelete = true; + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p removed %d\n", this, numberOfCharacters ); removed = true; } @@ -1063,8 +1114,8 @@ Vector3 Controller::GetNaturalSize() mImpl->mTextUpdateInfo.mParagraphCharacterIndex = 0u; mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters = mImpl->mLogicalModel->mText.Count(); - // Store the actual control's width. - const float actualControlWidth = mImpl->mVisualModel->mControlSize.width; + // Store the actual control's size to restore later. + const Size actualControlSize = mImpl->mVisualModel->mControlSize; DoRelayout( Size( MAX_FLOAT, MAX_FLOAT ), static_cast( onlyOnceOperations | @@ -1089,8 +1140,8 @@ Vector3 Controller::GetNaturalSize() // Clear the update info. This info will be set the next time the text is updated. mImpl->mTextUpdateInfo.Clear(); - // Restore the actual control's width. - mImpl->mVisualModel->mControlSize.width = actualControlWidth; + // Restore the actual control's size. + mImpl->mVisualModel->mControlSize = actualControlSize; DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetNaturalSize calculated %f,%f,%f\n", naturalSize.x, naturalSize.y, naturalSize.z ); } @@ -1173,7 +1224,7 @@ float Controller::GetHeightForWidth( float width ) bool Controller::Relayout( const Size& size ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::Relayout %p size %f,%f\n", this, size.width, size.height ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::Relayout %p size %f,%f, autoScroll[%s]\n", this, size.width, size.height, (mImpl->mAutoScrollEnabled)?"true":"false" ); if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) ) { @@ -1385,13 +1436,6 @@ void Controller::TextInsertedEvent() // Apply modifications to the model; TODO - Optimize this mImpl->mOperationsPending = ALL_OPERATIONS; - - // Queue a cursor reposition event; this must wait until after DoRelayout() - if( EventData::IsEditingState( mImpl->mEventData->mState ) ) - { - mImpl->mEventData->mUpdateCursorPosition = true; - mImpl->mEventData->mScrollAfterUpdatePosition = true; - } } void Controller::TextDeletedEvent() @@ -1408,13 +1452,6 @@ void Controller::TextDeletedEvent() // Apply modifications to the model; TODO - Optimize this mImpl->mOperationsPending = ALL_OPERATIONS; - - // Queue a cursor reposition event; this must wait until after DoRelayout() - mImpl->mEventData->mUpdateCursorPosition = true; - if( 0u != mImpl->mLogicalModel->mText.Count() ) - { - mImpl->mEventData->mScrollAfterDelete = true; - } } bool Controller::DoRelayout( const Size& size, @@ -1430,8 +1467,10 @@ bool Controller::DoRelayout( const Size& size, const CharacterIndex startIndex = mImpl->mTextUpdateInfo.mParagraphCharacterIndex; const Length requestedNumberOfCharacters = mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters; - if( LAYOUT & operations ) + if( NO_OPERATION != ( LAYOUT & operations ) ) { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::DoRelayout LAYOUT & operations\n"); + // Some vectors with data needed to layout and reorder may be void // after the first time the text has been laid out. // Fill the vectors again. @@ -1449,7 +1488,7 @@ bool Controller::DoRelayout( const Size& size, if( 0u == totalNumberOfGlyphs ) { - if( UPDATE_ACTUAL_SIZE & operations ) + if( NO_OPERATION != ( UPDATE_ACTUAL_SIZE & operations ) ) { mImpl->mVisualModel->SetLayoutSize( Size::ZERO ); } @@ -1500,10 +1539,16 @@ bool Controller::DoRelayout( const Size& size, mImpl->mVisualModel->mLines, layoutSize ); + if( viewUpdated ) { + if ( NO_OPERATION != ( UPDATE_DIRECTION & operations ) ) + { + mImpl->mAutoScrollDirectionRTL = false; + } + // Reorder the lines - if( REORDER & operations ) + if( NO_OPERATION != ( REORDER & operations ) ) { Vector& bidirectionalInfo = mImpl->mLogicalModel->mBidirectionalParagraphInfo; Vector& bidirectionalLineInfo = mImpl->mLogicalModel->mBidirectionalLineInfo; @@ -1526,27 +1571,25 @@ bool Controller::DoRelayout( const Size& size, layoutParameters.lineBidirectionalInfoRunsBuffer = bidirectionalLineInfo.Begin(); layoutParameters.numberOfBidirectionalInfoRuns = bidirectionalLineInfo.Count(); - // TODO: update the conversion map instead creating it from scratch. - // Note this tables store indices to characters, so update the table means modify all the indices of the text after the last updated character. - // It's better to refactor this. Store this table per line and don't update the indices. - // For the cursor position probably is better to use the function instead creating a table. - // Set the bidirectional info into the model. - mImpl->mLogicalModel->SetVisualToLogicalMap( layoutParameters.lineBidirectionalInfoRunsBuffer, - layoutParameters.numberOfBidirectionalInfoRuns, - 0u, - mImpl->mLogicalModel->mText.Count() ); - // Re-layout the text. Reorder those lines with right to left characters. mImpl->mLayoutEngine.ReLayoutRightToLeftLines( layoutParameters, startIndex, requestedNumberOfCharacters, glyphPositions ); + if ( ( NO_OPERATION != ( UPDATE_DIRECTION & operations ) ) && ( numberOfLines > 0 ) ) + { + const LineRun* const firstline = mImpl->mVisualModel->mLines.Begin(); + if ( firstline ) + { + mImpl->mAutoScrollDirectionRTL = firstline->direction; + } + } } } // REORDER // Sets the actual size. - if( UPDATE_ACTUAL_SIZE & operations ) + if( NO_OPERATION != ( UPDATE_ACTUAL_SIZE & operations ) ) { mImpl->mVisualModel->SetLayoutSize( layoutSize ); } @@ -1560,7 +1603,7 @@ bool Controller::DoRelayout( const Size& size, layoutSize = mImpl->mVisualModel->GetLayoutSize(); } - if( ALIGN & operations ) + if( NO_OPERATION != ( ALIGN & operations ) ) { // The laid-out lines. Vector& lines = mImpl->mVisualModel->mLines; @@ -1572,7 +1615,11 @@ bool Controller::DoRelayout( const Size& size, viewUpdated = true; } - +#if defined(DEBUG_ENABLED) + std::string currentText; + GetText( currentText ); + DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::DoRelayout [%p] mImpl->mAutoScrollDirectionRTL[%s] [%s]\n", this, (mImpl->mAutoScrollDirectionRTL)?"true":"false", currentText.c_str() ); +#endif DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::DoRelayout, view updated %s\n", ( viewUpdated ? "true" : "false" ) ); return viewUpdated; } @@ -1871,16 +1918,13 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ // TODO: At the moment the underline runs are only for pre-edit. mImpl->mVisualModel->mUnderlineRuns.Clear(); - Vector utf32Characters; - Length characterCount( 0u ); + // Keep the current number of characters. + const Length currentNumberOfCharacters = mImpl->IsShowingRealText() ? mImpl->mLogicalModel->mText.Count() : 0u; - // Remove the previous IMF pre-edit (predicitive text) - if( mImpl->mEventData->mPreEditFlag && - ( 0u != mImpl->mEventData->mPreEditLength ) ) + // Remove the previous IMF pre-edit. + if( mImpl->mEventData->mPreEditFlag && ( 0u != mImpl->mEventData->mPreEditLength ) ) { - const CharacterIndex offset = mImpl->mEventData->mPrimaryCursorPosition - mImpl->mEventData->mPreEditStartPosition; - - removedPrevious = RemoveText( -static_cast( offset ), + removedPrevious = RemoveText( -static_cast( mImpl->mEventData->mPrimaryCursorPosition - mImpl->mEventData->mPreEditStartPosition ), mImpl->mEventData->mPreEditLength, DONT_UPDATE_INPUT_STYLE ); @@ -1889,10 +1933,13 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ } else { - // Remove the previous Selection + // Remove the previous Selection. removedPrevious = RemoveSelectedText(); } + Vector utf32Characters; + Length characterCount = 0u; + if( !text.empty() ) { // Convert text into UTF-32 @@ -2057,6 +2104,8 @@ 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 ); } + const Length numberOfCharacters = mImpl->IsShowingRealText() ? mImpl->mLogicalModel->mText.Count() : 0u; + if( ( 0u == mImpl->mLogicalModel->mText.Count() ) && mImpl->IsPlaceholderAvailable() ) { @@ -2070,6 +2119,16 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ { // Queue an inserted event mImpl->QueueModifyEvent( ModifyEvent::TEXT_INSERTED ); + + mImpl->mEventData->mUpdateCursorPosition = true; + if( numberOfCharacters < currentNumberOfCharacters ) + { + mImpl->mEventData->mScrollAfterDelete = true; + } + else + { + mImpl->mEventData->mScrollAfterUpdatePosition = true; + } } if( maxLengthReached ) @@ -2115,10 +2174,10 @@ void Controller::TapEvent( unsigned int tapCount, float x, float y ) // This is to avoid unnecessary relayouts when tapping an empty text-field bool relayoutNeeded( false ); - if( ( EventData::EDITING_WITH_PASTE_POPUP == mImpl->mEventData->mState ) || + if( ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) || ( EventData::EDITING_WITH_PASTE_POPUP == mImpl->mEventData->mState ) ) { - mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE); // If Popup shown hide it here so can be shown again if required. + mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE ); // If Popup shown hide it here so can be shown again if required. } if( mImpl->IsShowingRealText() && ( EventData::INACTIVE != mImpl->mEventData->mState ) ) @@ -2345,8 +2404,13 @@ void Controller::PasteClipboardItemEvent() // Commit the current pre-edit text; the contents of the clipboard should be appended mImpl->ResetImfManager(); + // Temporary disable hiding clipboard + mImpl->SetClipboardHideEnable( false ); + // Paste PasteText( stringToPaste ); + + mImpl->SetClipboardHideEnable( true ); } void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Buttons button ) @@ -2377,8 +2441,11 @@ void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Butt else { ShowPlaceholderText(); - mImpl->mEventData->mUpdateCursorPosition = true; } + + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterDelete = true; + mImpl->RequestRelayout(); mImpl->mControlInterface.TextChanged(); break; @@ -2466,8 +2533,9 @@ ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, cons else { ShowPlaceholderText(); - mImpl->mEventData->mUpdateCursorPosition = true; } + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterDelete = true; } requestRelayout = true; break; @@ -2554,8 +2622,9 @@ bool Controller::BackspaceKeyEvent() else { ShowPlaceholderText(); - mImpl->mEventData->mUpdateCursorPosition = true; } + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterDelete = true; } return removed;