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=1a39d1694385e09db68f04ad7ad5d7675a602b6c;hp=f6bc9169c46ec9f975f042dc447f0afbdc6d17aa;hb=ebbf2aed6e030f66f640d0f4c933e76e9b63ee27;hpb=43810310547ea62237f91305e8b9724fd017492a diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index f6bc916..1a39d16 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -109,7 +109,8 @@ struct Controller::TextInput { INACTIVE, SELECTING, - EDITING + EDITING, + EDITING_WITH_POPUP }; TextInput( LogicalModelPtr logicalModel, @@ -123,9 +124,9 @@ struct Controller::TextInput mSecondaryCursorPosition( 0u ), mDecoratorUpdated( false ), mCursorBlinkEnabled( true ), - mGrabHandleEnabled( false ), - mGrabHandlePopupEnabled( false ), - mSelectionEnabled( false ), + mGrabHandleEnabled( true ), + mGrabHandlePopupEnabled( true ), + mSelectionEnabled( true ), mHorizontalScrollingEnabled( true ), mVerticalScrollingEnabled( false ), mUpdateCursorPosition( false ) @@ -135,7 +136,8 @@ struct Controller::TextInput /** * @brief Helper to move the cursor, grab handle etc. */ - bool ProcessInputEvents( const Vector2& controlSize ) + bool ProcessInputEvents( const Vector2& controlSize, + const Vector2& alignmentOffset ) { mDecoratorUpdated = false; @@ -162,12 +164,12 @@ struct Controller::TextInput } case TAP_EVENT: { - OnTapEvent( *iter ); + OnTapEvent( *iter, alignmentOffset ); break; } case PAN_EVENT: { - OnPanEvent( *iter, controlSize ); + OnPanEvent( *iter, controlSize, alignmentOffset ); break; } case GRAB_HANDLE_EVENT: @@ -230,7 +232,8 @@ struct Controller::TextInput // TODO } - void OnTapEvent( const Event& event ) + void OnTapEvent( const Event& event, + const Vector2& alignmentOffset ) { unsigned int tapCount = event.p1.mUint; @@ -238,8 +241,8 @@ struct Controller::TextInput { ChangeState( EDITING ); - float xPosition = event.p2.mFloat; - float yPosition = event.p3.mFloat; + float xPosition = event.p2.mFloat - alignmentOffset.x; + float yPosition = event.p3.mFloat - alignmentOffset.y; float height(0.0f); GetClosestCursorPosition( mPrimaryCursorPosition, xPosition, yPosition, height ); mDecorator->SetPosition( PRIMARY_CURSOR, xPosition, yPosition, height ); @@ -251,10 +254,14 @@ struct Controller::TextInput 2u == tapCount ) { ChangeState( SELECTING ); + + RepositionSelectionHandles( event.p2.mFloat, event.p3.mFloat ); } } - void OnPanEvent( const Event& event, const Vector2& controlSize ) + void OnPanEvent( const Event& event, + const Vector2& controlSize, + const Vector2& alignmentOffset ) { int state = event.p1.mInt; @@ -265,28 +272,43 @@ struct Controller::TextInput if( mHorizontalScrollingEnabled ) { - float displacementX = event.p2.mFloat; + const float displacementX = event.p2.mFloat; mScrollPosition.x += displacementX; - // Clamp between -space & 0 - float contentWidth = actualSize.width; - float space = (contentWidth > controlSize.width) ? contentWidth - controlSize.width : 0.0f; - mScrollPosition.x = ( mScrollPosition.x < -space ) ? -space : mScrollPosition.x; - mScrollPosition.x = ( mScrollPosition.x > 0 ) ? 0 : mScrollPosition.x; + // Clamp between -space & 0 (and the text alignment). + const float contentWidth = actualSize.width; + if( contentWidth > controlSize.width ) + { + const float space = ( contentWidth - controlSize.width ) + alignmentOffset.x; + mScrollPosition.x = ( mScrollPosition.x < -space ) ? -space : mScrollPosition.x; + mScrollPosition.x = ( mScrollPosition.x > -alignmentOffset.x ) ? -alignmentOffset.x : mScrollPosition.x; - mDecoratorUpdated = true; + mDecoratorUpdated = true; + } + else + { + mScrollPosition.x = 0.f; + } } + if( mVerticalScrollingEnabled ) { - float displacementY = event.p3.mFloat; + const float displacementY = event.p3.mFloat; mScrollPosition.y += displacementY; - // Clamp between -space & 0 - float space = (actualSize.height > controlSize.height) ? actualSize.height - controlSize.height : 0.0f; - mScrollPosition.y = ( mScrollPosition.y < -space ) ? -space : mScrollPosition.y; - mScrollPosition.y = ( mScrollPosition.y > 0 ) ? 0 : mScrollPosition.y; + // Clamp between -space & 0 (and the text alignment). + if( actualSize.height > controlSize.height ) + { + const float space = ( actualSize.height - controlSize.height ) + alignmentOffset.y; + mScrollPosition.y = ( mScrollPosition.y < -space ) ? -space : mScrollPosition.y; + mScrollPosition.y = ( mScrollPosition.y > -alignmentOffset.y ) ? -alignmentOffset.y : mScrollPosition.y; - mDecoratorUpdated = true; + mDecoratorUpdated = true; + } + else + { + mScrollPosition.y = 0.f; + } } } } @@ -304,13 +326,46 @@ struct Controller::TextInput GetClosestCursorPosition( mPrimaryCursorPosition, xPosition, yPosition, height ); mDecorator->SetPosition( PRIMARY_CURSOR, xPosition, yPosition, height ); - mDecorator->HidePopup(); + //mDecorator->HidePopup(); + ChangeState ( EDITING ); mDecoratorUpdated = true; } else if ( mGrabHandlePopupEnabled && GRAB_HANDLE_RELEASED == state ) { - mDecorator->ShowPopup(); + //mDecorator->ShowPopup(); + ChangeState ( EDITING_WITH_POPUP ); + mDecoratorUpdated = true; + } + } + + void RepositionSelectionHandles( float visualX, float visualY ) + { + // TODO - Find which word was selected + + const Vector& glyphs = mVisualModel->mGlyphs; + const Vector::SizeType glyphCount = glyphs.Count(); + + const Vector& positions = mVisualModel->mGlyphPositions; + const Vector::SizeType positionCount = positions.Count(); + + // Guard against glyphs which did not fit inside the layout + const Vector::SizeType count = (positionCount < glyphCount) ? positionCount : glyphCount; + + if( count ) + { + float primaryX = positions[0].x; + float secondaryX = positions[count-1].x + glyphs[count-1].width; + + // TODO - multi-line selection + const Vector& lines = mVisualModel->mLines; + float height = lines.Count() ? lines[0].lineSize.height : 0.0f; + + mDecorator->SetPosition( PRIMARY_SELECTION_HANDLE, primaryX, 0.0f, height ); + mDecorator->SetPosition( SECONDARY_SELECTION_HANDLE, secondaryX, 0.0f, height ); + + mDecorator->ClearHighlights(); + mDecorator->AddHighlight( primaryX, 0.0f, secondaryX, height ); } } @@ -326,7 +381,7 @@ struct Controller::TextInput mDecorator->StopCursorBlink(); mDecorator->SetGrabHandleActive( false ); mDecorator->SetSelectionActive( false ); - mDecorator->HidePopup(); + mDecorator->SetPopupActive( false ); mDecoratorUpdated = true; } else if ( SELECTING == mState ) @@ -348,6 +403,28 @@ struct Controller::TextInput { mDecorator->SetGrabHandleActive( true ); } + if( mGrabHandlePopupEnabled ) + { + mDecorator->SetPopupActive( false ); + } + mDecorator->SetSelectionActive( false ); + mDecoratorUpdated = true; + } + else if( EDITING_WITH_POPUP == mState ) + { + mDecorator->SetActiveCursor( ACTIVE_CURSOR_PRIMARY ); + if( mCursorBlinkEnabled ) + { + mDecorator->StartCursorBlink(); + } + if( mGrabHandleEnabled ) + { + mDecorator->SetGrabHandleActive( true ); + } + if( mGrabHandlePopupEnabled ) + { + mDecorator->SetPopupActive( true ); + } mDecorator->SetSelectionActive( false ); mDecoratorUpdated = true; } @@ -364,11 +441,11 @@ struct Controller::TextInput totalHeight += lines[lineIndex].lineSize.height; if( y < totalHeight ) { - break; + return lineIndex; } } - return lineIndex; + return lineIndex-1; } void GetClosestCursorPosition( CharacterIndex& logical, float& visualX, float& visualY, float& height ) @@ -464,7 +541,7 @@ struct Controller::TextInput float visualX( 0.0f ); float visualY( 0.0f ); - LineIndex lineIndex( 0u ); + float height( 0.0f ); const Vector& lineRuns = mVisualModel->mLines; if( cursorGlyph > 0 ) @@ -476,17 +553,19 @@ struct Controller::TextInput visualX += mVisualModel->mGlyphs[ cursorGlyph ].width; // Find the line height - for( GlyphIndex lastGlyph = 0; lineIndex < lineRuns.Count(); ++lineIndex ) + GlyphIndex lastGlyph( 0 ); + for( LineIndex lineIndex = 0u; lineIndex < lineRuns.Count(); ++lineIndex ) { lastGlyph = (lineRuns[lineIndex].glyphIndex + lineRuns[lineIndex].numberOfGlyphs); if( cursorGlyph < lastGlyph ) { + height = lineRuns[lineIndex].lineSize.height; break; } } } - mDecorator->SetPosition( PRIMARY_CURSOR, visualX, visualY, lineRuns[lineIndex].lineSize.height ); + mDecorator->SetPosition( PRIMARY_CURSOR, visualX, visualY, height ); mDecoratorUpdated = true; } @@ -561,6 +640,7 @@ struct Controller::Impl mLayoutEngine(), mModifyEvents(), mControlSize(), + mAlignmentOffset(), mOperationsPending( NO_OPERATION ), mRecalculateNaturalSize( true ) { @@ -587,6 +667,7 @@ struct Controller::Impl LayoutEngine mLayoutEngine; ///< The layout engine. std::vector mModifyEvents; ///< Temporary stores the text set until the next relayout. Size mControlSize; ///< The size of the control. + Vector2 mAlignmentOffset; ///< Vertical and horizontal offset of the whole text inside the control due to alignment. OperationsMask mOperationsPending; ///< Operations pending to be done to layout the text. bool mRecalculateNaturalSize:1; ///< Whether the natural size needs to be recalculated. }; @@ -656,6 +737,18 @@ void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily ) mImpl->mFontDefaults->mFontId = 0u; // Remove old font ID mImpl->mOperationsPending = ALL_OPERATIONS; mImpl->mRecalculateNaturalSize = true; + + // Clear the font-specific data + mImpl->mLogicalModel->mFontRuns.Clear(); + mImpl->mVisualModel->mGlyphs.Clear(); + mImpl->mVisualModel->mGlyphsToCharacters.Clear(); + mImpl->mVisualModel->mCharactersToGlyph.Clear(); + mImpl->mVisualModel->mCharactersPerGlyph.Clear(); + mImpl->mVisualModel->mGlyphsPerCharacter.Clear(); + mImpl->mVisualModel->mGlyphPositions.Clear(); + mImpl->mVisualModel->mLines.Clear(); + + RequestRelayout(); } const std::string& Controller::GetDefaultFontFamily() const @@ -679,6 +772,18 @@ void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle ) mImpl->mFontDefaults->mFontId = 0u; // Remove old font ID mImpl->mOperationsPending = ALL_OPERATIONS; mImpl->mRecalculateNaturalSize = true; + + // Clear the font-specific data + mImpl->mLogicalModel->mFontRuns.Clear(); + mImpl->mVisualModel->mGlyphs.Clear(); + mImpl->mVisualModel->mGlyphsToCharacters.Clear(); + mImpl->mVisualModel->mCharactersToGlyph.Clear(); + mImpl->mVisualModel->mCharactersPerGlyph.Clear(); + mImpl->mVisualModel->mGlyphsPerCharacter.Clear(); + mImpl->mVisualModel->mGlyphPositions.Clear(); + mImpl->mVisualModel->mLines.Clear(); + + RequestRelayout(); } const std::string& Controller::GetDefaultFontStyle() const @@ -702,6 +807,18 @@ void Controller::SetDefaultPointSize( float pointSize ) mImpl->mFontDefaults->mFontId = 0u; // Remove old font ID mImpl->mOperationsPending = ALL_OPERATIONS; mImpl->mRecalculateNaturalSize = true; + + // Clear the font-specific data + mImpl->mLogicalModel->mFontRuns.Clear(); + mImpl->mVisualModel->mGlyphs.Clear(); + mImpl->mVisualModel->mGlyphsToCharacters.Clear(); + mImpl->mVisualModel->mCharactersToGlyph.Clear(); + mImpl->mVisualModel->mCharactersPerGlyph.Clear(); + mImpl->mVisualModel->mGlyphsPerCharacter.Clear(); + mImpl->mVisualModel->mGlyphPositions.Clear(); + mImpl->mVisualModel->mLines.Clear(); + + RequestRelayout(); } float Controller::GetDefaultPointSize() const @@ -772,6 +889,11 @@ const Vector2& Controller::GetScrollPosition() const return Vector2::ZERO; } +const Vector2& Controller::GetAlignmentOffset() const +{ + return mImpl->mAlignmentOffset; +} + Vector3 Controller::GetNaturalSize() { Vector3 naturalSize; @@ -867,7 +989,7 @@ float Controller::GetHeightForWidth( float width ) return layoutSize.height; } -bool Controller::Relayout( const Vector2& size ) +bool Controller::Relayout( const Size& size ) { if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) ) { @@ -906,10 +1028,13 @@ bool Controller::Relayout( const Vector2& size ) // Do not re-do any operation until something changes. mImpl->mOperationsPending = NO_OPERATION; + // After doing the text layout, the alignment offset to place the actor in the desired position can be calculated. + CalculateTextAlignment( size ); + if( mImpl->mTextInput ) { // Move the cursor, grab handle etc. - updated = mImpl->mTextInput->ProcessInputEvents( mImpl->mControlSize ) || updated; + updated = mImpl->mTextInput->ProcessInputEvents( mImpl->mControlSize, mImpl->mAlignmentOffset ) || updated; } return updated; @@ -1258,7 +1383,7 @@ void Controller::UpdateModel( OperationsMask operationsRequired ) } } -bool Controller::DoRelayout( const Vector2& size, +bool Controller::DoRelayout( const Size& size, OperationsMask operationsRequired, Size& layoutSize ) { @@ -1368,6 +1493,7 @@ bool Controller::DoRelayout( const Vector2& size, if( ALIGN & operations ) { mImpl->mLayoutEngine.Align( layoutParameters, + layoutSize, lines, glyphPositions ); } @@ -1387,6 +1513,53 @@ bool Controller::DoRelayout( const Vector2& size, return viewUpdated; } +void Controller::CalculateTextAlignment( const Size& size ) +{ + // TODO : Calculate the vertical offset. + + // Get the direction of the first character. + const CharacterDirection firstParagraphDirection = mImpl->mLogicalModel->GetCharacterDirection( 0u ); + + const Size& actualSize = mImpl->mVisualModel->GetActualSize(); + + // If the first paragraph is right to left swap ALIGN_BEGIN and ALIGN_END; + LayoutEngine::Alignment alignment = mImpl->mLayoutEngine.GetAlignment(); + if( firstParagraphDirection && + ( LayoutEngine::ALIGN_CENTER != alignment ) ) + { + if( LayoutEngine::ALIGN_BEGIN == alignment ) + { + alignment = LayoutEngine::ALIGN_END; + } + else + { + alignment = LayoutEngine::ALIGN_BEGIN; + } + } + + switch( alignment ) + { + case LayoutEngine::ALIGN_BEGIN: + { + mImpl->mAlignmentOffset = Vector2::ZERO; + break; + } + case LayoutEngine::ALIGN_CENTER: + { + mImpl->mAlignmentOffset.y = 0.f; + const int intOffset = static_cast( 0.5f * ( size.width - actualSize.width ) ); // try to avoid pixel alignment. + mImpl->mAlignmentOffset.x = static_cast( intOffset ); + break; + } + case LayoutEngine::ALIGN_END: + { + mImpl->mAlignmentOffset.y = 0.f; + mImpl->mAlignmentOffset.x = size.width - actualSize.width; + break; + } + } +} + View& Controller::GetView() { return mImpl->mView; @@ -1469,6 +1642,8 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) mImpl->mModifyEvents.push_back( event ); } + mImpl->mTextInput->ChangeState( TextInput::EDITING ); // todo Confirm this is the best place to change the state of + RequestRelayout(); }