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=47b0115f3e3190af02cfc4e3407611993031aeba;hp=79185bae4d6404fae217f43f4b7c0e9ea29b0b9d;hb=5a984a1705bf94f17a8ef6a05ce170d1a47e49b1;hpb=6f62c2545af5b288bf447c380ccfb562cc7a4370 diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 79185ba..47b0115 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -29,20 +29,36 @@ #include #include #include -#include +#include #include #include #include #include +#include #include -#include +#include using std::vector; namespace { + const float MAX_FLOAT = std::numeric_limits::max(); const std::string EMPTY_STRING; + +enum ModifyType +{ + REPLACE_TEXT, ///< Replace the entire text + INSERT_TEXT, ///< Insert characters at the current cursor position + DELETE_TEXT ///< Delete a character at the current cursor position +}; + +struct ModifyEvent +{ + ModifyType type; + std::string text; +}; + } // namespace namespace Dali @@ -61,8 +77,9 @@ struct Controller::TextInput { KEYBOARD_FOCUS_GAIN_EVENT, KEYBOARD_FOCUS_LOST_EVENT, - KEY_EVENT, + CURSOR_KEY_EVENT, TAP_EVENT, + PAN_EVENT, GRAB_HANDLE_EVENT }; @@ -71,7 +88,6 @@ struct Controller::TextInput int mInt; unsigned int mUint; float mFloat; - char* mString; }; struct Event @@ -103,15 +119,23 @@ struct Controller::TextInput mVisualModel( visualModel ), mDecorator( decorator ), mState( INACTIVE ), + mPrimaryCursorPosition( 0u ), + mSecondaryCursorPosition( 0u ), mDecoratorUpdated( false ), - mCursorBlinkEnabled( true ) + mCursorBlinkEnabled( true ), + mGrabHandleEnabled( false ), + mGrabHandlePopupEnabled( false ), + mSelectionEnabled( false ), + mHorizontalScrollingEnabled( true ), + mVerticalScrollingEnabled( false ), + mUpdateCursorPosition( false ) { } /** * @brief Helper to move the cursor, grab handle etc. */ - bool ProcessInputEvents() + bool ProcessInputEvents( const Vector2& controlSize ) { mDecoratorUpdated = false; @@ -131,9 +155,9 @@ struct Controller::TextInput OnKeyboardFocus( false ); break; } - case KEY_EVENT: + case CURSOR_KEY_EVENT: { - OnKeyEvent( *iter ); + OnCursorKeyEvent( *iter ); break; } case TAP_EVENT: @@ -141,6 +165,11 @@ struct Controller::TextInput OnTapEvent( *iter ); break; } + case PAN_EVENT: + { + OnPanEvent( *iter, controlSize ); + break; + } case GRAB_HANDLE_EVENT: { OnGrabHandleEvent( *iter ); @@ -150,6 +179,13 @@ struct Controller::TextInput } } + // The cursor must also be repositioned after inserts into the model + if( mUpdateCursorPosition ) + { + UpdateCursorPosition(); + mUpdateCursorPosition = false; + } + mEventQueue.clear(); return mDecoratorUpdated; @@ -167,56 +203,33 @@ struct Controller::TextInput } } - void OnKeyEvent( const Event& event ) + void OnCursorKeyEvent( const Event& event ) { int keyCode = event.p1.mInt; - // Handle state changes - if( Dali::DALI_KEY_ESCAPE == keyCode ) + if( Dali::DALI_KEY_CURSOR_LEFT == keyCode ) { - ChangeState( INACTIVE ); // Escape key ends edit mode + // TODO } - else if ( event.p2.mString ) + else if( Dali::DALI_KEY_CURSOR_RIGHT == keyCode ) { - // Some text may be selected, hiding keyboard causes an empty keystring to be sent, we don't want to delete highlight in this case - ChangeState( EDITING ); + // TODO } - - // Handle the actual key event - if( Dali::DALI_KEY_BACKSPACE == keyCode ) + else if( Dali::DALI_KEY_CURSOR_UP == keyCode ) { - HandleBackspaceKey(); + // TODO } - else if( Dali::DALI_KEY_CURSOR_LEFT == keyCode || - Dali::DALI_KEY_CURSOR_RIGHT == keyCode || - Dali::DALI_KEY_CURSOR_UP == keyCode || - Dali::DALI_KEY_CURSOR_DOWN == keyCode ) + else if( Dali::DALI_KEY_CURSOR_DOWN == keyCode ) { - HandleCursorKey( keyCode ); - } - else if ( event.p2.mString ) - { - HandleKeyString( event.p2.mString ); - - delete [] event.p2.mString; + // TODO } } - void HandleBackspaceKey() - { - // TODO - } - void HandleCursorKey( int keyCode ) { // TODO } - void HandleKeyString( const char* keyString ) - { - // TODO - } - void OnTapEvent( const Event& event ) { unsigned int tapCount = event.p1.mUint; @@ -228,17 +241,56 @@ struct Controller::TextInput float xPosition = event.p2.mFloat; float yPosition = event.p3.mFloat; float height(0.0f); - GetClosestCursorPosition( xPosition, yPosition, height ); + GetClosestCursorPosition( mPrimaryCursorPosition, xPosition, yPosition, height ); mDecorator->SetPosition( PRIMARY_CURSOR, xPosition, yPosition, height ); + mUpdateCursorPosition = false; mDecoratorUpdated = true; } - else if( 2u == tapCount ) + else if( mSelectionEnabled && + 2u == tapCount ) { ChangeState( SELECTING ); } } + void OnPanEvent( const Event& event, const Vector2& controlSize ) + { + int state = event.p1.mInt; + + if( Gesture::Started == state || + Gesture::Continuing == state ) + { + const Vector2& actualSize = mVisualModel->GetActualSize(); + + if( mHorizontalScrollingEnabled ) + { + 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; + + mDecoratorUpdated = true; + } + if( mVerticalScrollingEnabled ) + { + 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; + + mDecoratorUpdated = true; + } + } + } + void OnGrabHandleEvent( const Event& event ) { unsigned int state = event.p1.mUint; @@ -249,17 +301,17 @@ struct Controller::TextInput float yPosition = event.p3.mFloat; float height(0.0f); - GetClosestCursorPosition( xPosition, yPosition, height ); + GetClosestCursorPosition( mPrimaryCursorPosition, xPosition, yPosition, height ); mDecorator->SetPosition( PRIMARY_CURSOR, xPosition, yPosition, height ); mDecorator->HidePopup(); mDecoratorUpdated = true; } - else if ( GRAB_HANDLE_RELEASED == state ) + else if ( mGrabHandlePopupEnabled && + GRAB_HANDLE_RELEASED == state ) { mDecorator->ShowPopup(); } - } void ChangeState( State newState ) @@ -292,59 +344,150 @@ struct Controller::TextInput { mDecorator->StartCursorBlink(); } - mDecorator->SetGrabHandleActive( true ); + if( mGrabHandleEnabled ) + { + mDecorator->SetGrabHandleActive( true ); + } mDecorator->SetSelectionActive( false ); mDecoratorUpdated = true; } } } - void GetClosestCursorPosition( float& x, float& y, float& height ) + LineIndex GetClosestLine( float y ) { - // TODO - Look at LineRuns first + LineIndex lineIndex( 0u ); + + const Vector& lines = mVisualModel->mLines; + for( float totalHeight = 0; lineIndex < lines.Count(); ++lineIndex ) + { + totalHeight += lines[lineIndex].lineSize.height; + if( y < totalHeight ) + { + break; + } + } - Text::Length numberOfGlyphs = mVisualModel->GetNumberOfGlyphs(); - if( 0 == numberOfGlyphs ) + return lineIndex; + } + + void GetClosestCursorPosition( CharacterIndex& logical, float& visualX, float& visualY, float& height ) + { + Length numberOfGlyphs = mVisualModel->mGlyphs.Count(); + Length numberOfLines = mVisualModel->mLines.Count(); + if( 0 == numberOfGlyphs || + 0 == numberOfLines ) { return; } - Vector glyphs; - glyphs.Resize( numberOfGlyphs ); - mVisualModel->GetGlyphs( glyphs.Begin(), 0, numberOfGlyphs ); + // Transform to visual model coords + visualX -= mScrollPosition.x; + visualY -= mScrollPosition.y; + + // Find which line is closest + LineIndex lineIndex( GetClosestLine( visualY ) ); + + const Vector& glyphs = mVisualModel->mGlyphs; const GlyphInfo* const glyphsBuffer = glyphs.Begin(); - Vector positions; - positions.Resize( numberOfGlyphs ); - mVisualModel->GetGlyphPositions( positions.Begin(), 0, numberOfGlyphs ); + const Vector& positions = mVisualModel->mGlyphPositions; const Vector2* const positionsBuffer = positions.Begin(); unsigned int closestGlyph = 0; + bool leftOfGlyph( false ); // which side of the glyph? float closestDistance = MAX_FLOAT; - for( unsigned int i = 0, numberOfGLyphs = glyphs.Count(); i < numberOfGLyphs; ++i ) + const LineRun& line = mVisualModel->mLines[lineIndex]; + GlyphIndex startGlyph = line.glyphIndex; + GlyphIndex endGlyph = line.glyphIndex + line.numberOfGlyphs; + DALI_ASSERT_DEBUG( endGlyph <= glyphs.Count() && "Invalid line info" ); + + for( GlyphIndex i = startGlyph; i < endGlyph; ++i ) { const GlyphInfo& glyphInfo = *( glyphsBuffer + i ); const Vector2& position = *( positionsBuffer + i ); float glyphX = position.x + glyphInfo.width*0.5f; float glyphY = position.y + glyphInfo.height*0.5f; - float distanceToGlyph = fabsf( glyphX - x ) + fabsf( glyphY - y ); + float distanceToGlyph = fabsf( glyphX - visualX ) + fabsf( glyphY - visualY ); if( distanceToGlyph < closestDistance ) { closestDistance = distanceToGlyph; closestGlyph = i; + leftOfGlyph = ( visualX < glyphX ); } } - // TODO - Consider RTL languages - x = positions[closestGlyph].x + glyphs[closestGlyph].width; - y = 0.0f; + // Calculate the logical position + logical = mVisualModel->GetCharacterIndex( closestGlyph ); - FontMetrics metrics; - TextAbstraction::FontClient::Get().GetFontMetrics( glyphs[closestGlyph].fontId, metrics ); - height = metrics.height; // TODO - Fix for multi-line + // Returns the visual position of the glyph + visualX = positions[closestGlyph].x; + if( !leftOfGlyph ) + { + visualX += glyphs[closestGlyph].width; + + //if( LTR ) TODO + ++logical; + } + else// if ( RTL ) TODO + { + //++logical; + } + visualY = 0.0f; + + height = line.lineSize.height; + } + + void UpdateCursorPosition() + { + if( 0 == mVisualModel->mGlyphs.Count() ) + { + return; + } + + // FIXME GetGlyphIndex() is behaving strangely +#if 0 + GlyphIndex cursorGlyph = mVisualModel->GetGlyphIndex( mPrimaryCursorPosition ); +#else + GlyphIndex cursorGlyph( 0u ); + for( cursorGlyph = 0; cursorGlyph < mVisualModel->mGlyphs.Count(); ++cursorGlyph ) + { + if( mPrimaryCursorPosition == mVisualModel->GetCharacterIndex( cursorGlyph ) ) + { + break; + } + } +#endif + + float visualX( 0.0f ); + float visualY( 0.0f ); + LineIndex lineIndex( 0u ); + const Vector& lineRuns = mVisualModel->mLines; + + if( cursorGlyph > 0 ) + { + --cursorGlyph; + + visualX = mVisualModel->mGlyphPositions[ cursorGlyph ].x; + //if( LTR ) TODO + visualX += mVisualModel->mGlyphs[ cursorGlyph ].width; + + // Find the line height + for( GlyphIndex lastGlyph = 0; lineIndex < lineRuns.Count(); ++lineIndex ) + { + lastGlyph = (lineRuns[lineIndex].glyphIndex + lineRuns[lineIndex].numberOfGlyphs); + if( cursorGlyph < lastGlyph ) + { + break; + } + } + } + + mDecorator->SetPosition( PRIMARY_CURSOR, visualX, visualY, lineRuns[lineIndex].lineSize.height ); + mDecoratorUpdated = true; } LogicalModelPtr mLogicalModel; @@ -359,10 +502,25 @@ struct Controller::TextInput */ vector mEventQueue; ///< The queue of touch events etc. - State mState; + State mState; ///< Selection mode, edit mode etc. + + CharacterIndex mPrimaryCursorPosition; ///< Index into logical model for primary cursor + CharacterIndex mSecondaryCursorPosition; ///< Index into logical model for secondary cursor - bool mDecoratorUpdated : 1; - bool mCursorBlinkEnabled : 1; + /** + * 0,0 means that the top-left corner of the layout matches the top-left corner of the UI control. + * Typically this will have a negative value with scrolling occurs. + */ + Vector2 mScrollPosition; ///< The text is offset by this position when scrolling. + + bool mDecoratorUpdated : 1; ///< True if the decorator was updated during event processing + bool mCursorBlinkEnabled : 1; ///< True if cursor should blink when active + bool mGrabHandleEnabled : 1; ///< True if grab handle is enabled + bool mGrabHandlePopupEnabled : 1; ///< True if the grab handle popu-up should be shown + bool mSelectionEnabled : 1; ///< True if selection handles, highlight etc. are enabled + bool mHorizontalScrollingEnabled : 1; ///< True if horizontal scrolling is enabled + bool mVerticalScrollingEnabled : 1; ///< True if vertical scrolling is enabled + bool mUpdateCursorPosition : 1; ///< True if the visual position of the cursor must be recalculated }; struct Controller::FontDefaults @@ -401,7 +559,7 @@ struct Controller::Impl mFontClient(), mView(), mLayoutEngine(), - mNewText(), + mModifyEvents(), mControlSize(), mOperationsPending( NO_OPERATION ), mRecalculateNaturalSize( true ) @@ -427,7 +585,7 @@ struct Controller::Impl TextAbstraction::FontClient mFontClient; ///< Handle to the font client. View mView; ///< The view interface to the rendering back-end. LayoutEngine mLayoutEngine; ///< The layout engine. - std::string mNewText; ///< Temporary stores the text set until the next relayout. + std::vector mModifyEvents; ///< Temporary stores the text set until the next relayout. Size mControlSize; ///< The size of the control. OperationsMask mOperationsPending; ///< Operations pending to be done to layout the text. bool mRecalculateNaturalSize:1; ///< Whether the natural size needs to be recalculated. @@ -440,26 +598,14 @@ ControllerPtr Controller::New( ControlInterface& controlInterface ) void Controller::SetText( const std::string& text ) { - // Keep until size negotiation - mImpl->mNewText = text; - - // All operations need to be done. (convert to utf32, get break info, ..., layout, ...) - mImpl->mOperationsPending = ALL_OPERATIONS; - - // The natural size needs to be re-calculated. - mImpl->mRecalculateNaturalSize = true; + // Cancel previously queued inserts etc. + mImpl->mModifyEvents.clear(); - // Reset buffers. - mImpl->mLogicalModel->SetText( NULL, 0u ); - mImpl->mLogicalModel->SetScripts( NULL, 0u ); - mImpl->mLogicalModel->SetFonts( NULL, 0u ); - mImpl->mLogicalModel->SetLineBreakInfo( NULL, 0u ); - mImpl->mLogicalModel->SetWordBreakInfo( NULL, 0u ); - mImpl->mLogicalModel->SetBidirectionalInfo( NULL, 0u ); - mImpl->mLogicalModel->SetVisualToLogicalMap( NULL, 0u ); - mImpl->mVisualModel->SetGlyphs( NULL, NULL, NULL, 0u ); - mImpl->mVisualModel->SetGlyphPositions( NULL, 0u ); - mImpl->mVisualModel->SetLines( NULL, 0u ); + // Keep until size negotiation + ModifyEvent event; + event.type = REPLACE_TEXT; + event.text = text; + mImpl->mModifyEvents.push_back( event ); if( mImpl->mTextInput ) { @@ -472,9 +618,10 @@ void Controller::SetText( const std::string& text ) void Controller::GetText( std::string& text ) const { - if( !mImpl->mNewText.empty() ) + if( !mImpl->mModifyEvents.empty() && + REPLACE_TEXT == mImpl->mModifyEvents[0].type ) { - text = mImpl->mNewText; + text = mImpl->mModifyEvents[0].text; } else { @@ -615,6 +762,111 @@ bool Controller::GetEnableCursorBlink() const return false; } +const Vector2& Controller::GetScrollPosition() const +{ + if( mImpl->mTextInput ) + { + return mImpl->mTextInput->mScrollPosition; + } + + return Vector2::ZERO; +} + +Vector3 Controller::GetNaturalSize() +{ + Vector3 naturalSize; + + // Make sure the model is up-to-date before layouting + ProcessModifyEvents(); + + if( mImpl->mRecalculateNaturalSize ) + { + // Operations that can be done only once until the text changes. + const OperationsMask onlyOnceOperations = static_cast( CONVERT_TO_UTF32 | + GET_SCRIPTS | + VALIDATE_FONTS | + GET_LINE_BREAKS | + GET_WORD_BREAKS | + BIDI_INFO | + SHAPE_TEXT | + GET_GLYPH_METRICS ); + // Make sure the model is up-to-date before layouting + UpdateModel( onlyOnceOperations ); + + // Operations that need to be done if the size changes. + const OperationsMask sizeOperations = static_cast( LAYOUT | + ALIGN | + REORDER ); + + DoRelayout( Size( MAX_FLOAT, MAX_FLOAT ), + static_cast( onlyOnceOperations | + sizeOperations ), + naturalSize.GetVectorXY() ); + + // Do not do again the only once operations. + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending & ~onlyOnceOperations ); + + // Do the size related operations again. + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | sizeOperations ); + + // Stores the natural size to avoid recalculate it again + // unless the text/style changes. + mImpl->mVisualModel->SetNaturalSize( naturalSize.GetVectorXY() ); + + mImpl->mRecalculateNaturalSize = false; + } + else + { + naturalSize = mImpl->mVisualModel->GetNaturalSize(); + } + + return naturalSize; +} + +float Controller::GetHeightForWidth( float width ) +{ + // Make sure the model is up-to-date before layouting + ProcessModifyEvents(); + + Size layoutSize; + if( width != mImpl->mControlSize.width ) + { + // Operations that can be done only once until the text changes. + const OperationsMask onlyOnceOperations = static_cast( CONVERT_TO_UTF32 | + GET_SCRIPTS | + VALIDATE_FONTS | + GET_LINE_BREAKS | + GET_WORD_BREAKS | + BIDI_INFO | + SHAPE_TEXT | + GET_GLYPH_METRICS ); + // Make sure the model is up-to-date before layouting + UpdateModel( onlyOnceOperations ); + + // Operations that need to be done if the size changes. + const OperationsMask sizeOperations = static_cast( LAYOUT | + ALIGN | + REORDER ); + + DoRelayout( Size( width, MAX_FLOAT ), + static_cast( onlyOnceOperations | + sizeOperations ), + layoutSize ); + + // Do not do again the only once operations. + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending & ~onlyOnceOperations ); + + // Do the size related operations again. + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | sizeOperations ); + } + else + { + layoutSize = mImpl->mVisualModel->GetActualSize(); + } + + return layoutSize.height; +} + bool Controller::Relayout( const Vector2& size ) { if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) ) @@ -635,14 +887,17 @@ bool Controller::Relayout( const Vector2& size ) // Operations that need to be done if the size changes. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | LAYOUT | + ALIGN | UPDATE_ACTUAL_SIZE | - UPDATE_POSITIONS | - UPDATE_LINES | REORDER ); mImpl->mControlSize = size; } + // Make sure the model is up-to-date before layouting + ProcessModifyEvents(); + UpdateModel( mImpl->mOperationsPending ); + Size layoutSize; bool updated = DoRelayout( mImpl->mControlSize, mImpl->mOperationsPending, @@ -654,79 +909,240 @@ bool Controller::Relayout( const Vector2& size ) if( mImpl->mTextInput ) { // Move the cursor, grab handle etc. - updated = mImpl->mTextInput->ProcessInputEvents() || updated; + updated = mImpl->mTextInput->ProcessInputEvents( mImpl->mControlSize ) || updated; } return updated; } -bool Controller::DoRelayout( const Vector2& size, - OperationsMask operationsRequired, - Size& layoutSize ) +void Controller::ProcessModifyEvents() { - bool viewUpdated( false ); + std::vector& events = mImpl->mModifyEvents; - // Calculate the operations to be done. - const OperationsMask operations = static_cast( mImpl->mOperationsPending & operationsRequired ); + for( unsigned int i=0; imLogicalModel->mText.Clear(); + mImpl->mLogicalModel->mScriptRuns.Clear(); + mImpl->mLogicalModel->mFontRuns.Clear(); + mImpl->mLogicalModel->mLineBreakInfo.Clear(); + mImpl->mLogicalModel->mWordBreakInfo.Clear(); + mImpl->mLogicalModel->mBidirectionalParagraphInfo.Clear(); + mImpl->mLogicalModel->mBidirectionalLineInfo.Clear(); + mImpl->mLogicalModel->mLogicalToVisualMap.Clear(); + mImpl->mLogicalModel->mVisualToLogicalMap.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(); + + // Convert text into UTF-32 + Vector& utf32Characters = mImpl->mLogicalModel->mText; + utf32Characters.Resize( text.size() ); + + // This is a bit horrible but std::string returns a (signed) char* + const uint8_t* utf8 = reinterpret_cast( text.c_str() ); + + // Transform a text array encoded in utf8 into an array encoded in utf32. + // It returns the actual number of characters. + Length characterCount = Utf8ToUtf32( utf8, text.size(), utf32Characters.Begin() ); + utf32Characters.Resize( characterCount ); + + // Reset the cursor position + if( mImpl->mTextInput ) + { + mImpl->mTextInput->mPrimaryCursorPosition = characterCount; + // TODO - handle secondary cursor + } + + // The natural size needs to be re-calculated. + mImpl->mRecalculateNaturalSize = true; + + // Apply modifications to the model + mImpl->mOperationsPending = ALL_OPERATIONS; + UpdateModel( ALL_OPERATIONS ); + mImpl->mOperationsPending = static_cast( LAYOUT | + ALIGN | + UPDATE_ACTUAL_SIZE | + REORDER ); +} +void Controller::InsertTextEvent( const std::string& text ) +{ + DALI_ASSERT_DEBUG( NULL != mImpl->mTextInput && "Unexpected InsertTextEvent" ); + + // TODO - Optimize this + mImpl->mLogicalModel->mScriptRuns.Clear(); + mImpl->mLogicalModel->mFontRuns.Clear(); + mImpl->mLogicalModel->mLineBreakInfo.Clear(); + mImpl->mLogicalModel->mWordBreakInfo.Clear(); + mImpl->mLogicalModel->mBidirectionalParagraphInfo.Clear(); + mImpl->mLogicalModel->mBidirectionalLineInfo.Clear(); + mImpl->mLogicalModel->mLogicalToVisualMap.Clear(); + mImpl->mLogicalModel->mVisualToLogicalMap.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(); + + // Convert text into UTF-32 Vector utf32Characters; - Length characterCount = 0u; - if( CONVERT_TO_UTF32 & operations ) + utf32Characters.Resize( text.size() ); + + // This is a bit horrible but std::string returns a (signed) char* + const uint8_t* utf8 = reinterpret_cast( text.c_str() ); + + // Transform a text array encoded in utf8 into an array encoded in utf32. + // It returns the actual number of characters. + Length characterCount = Utf8ToUtf32( utf8, text.size(), utf32Characters.Begin() ); + utf32Characters.Resize( characterCount ); + + // Insert at current cursor position + Vector& modifyText = mImpl->mLogicalModel->mText; + CharacterIndex& cursorIndex = mImpl->mTextInput->mPrimaryCursorPosition; + + if( cursorIndex < modifyText.Count() ) { - std::string& text = mImpl->mNewText; + modifyText.Insert( modifyText.Begin() + cursorIndex, utf32Characters.Begin(), utf32Characters.End() ); + } + else + { + modifyText.Insert( modifyText.End(), utf32Characters.Begin(), utf32Characters.End() ); + } - // Convert text into UTF-32 - utf32Characters.Resize( text.size() ); + // Advance the cursor position + ++cursorIndex; - // This is a bit horrible but std::string returns a (signed) char* - const uint8_t* utf8 = reinterpret_cast( text.c_str() ); + // The natural size needs to be re-calculated. + mImpl->mRecalculateNaturalSize = true; - // Transform a text array encoded in utf8 into an array encoded in utf32. - // It returns the actual number of characters. - characterCount = Utf8ToUtf32( utf8, text.size(), utf32Characters.Begin() ); - utf32Characters.Resize( characterCount ); + // Apply modifications to the model; TODO - Optimize this + mImpl->mOperationsPending = ALL_OPERATIONS; + UpdateModel( ALL_OPERATIONS ); + mImpl->mOperationsPending = static_cast( LAYOUT | + ALIGN | + UPDATE_ACTUAL_SIZE | + REORDER ); + + // Queue a cursor reposition event; this must wait until after DoRelayout() + mImpl->mTextInput->mUpdateCursorPosition = true; +} - // Sets the text into the model. - mImpl->mLogicalModel->SetText( utf32Characters.Begin(), characterCount ); +void Controller::DeleteTextEvent() +{ + DALI_ASSERT_DEBUG( NULL != mImpl->mTextInput && "Unexpected InsertTextEvent" ); + + // TODO - Optimize this + mImpl->mLogicalModel->mScriptRuns.Clear(); + mImpl->mLogicalModel->mFontRuns.Clear(); + mImpl->mLogicalModel->mLineBreakInfo.Clear(); + mImpl->mLogicalModel->mWordBreakInfo.Clear(); + mImpl->mLogicalModel->mBidirectionalParagraphInfo.Clear(); + mImpl->mLogicalModel->mBidirectionalLineInfo.Clear(); + mImpl->mLogicalModel->mLogicalToVisualMap.Clear(); + mImpl->mLogicalModel->mVisualToLogicalMap.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(); + + // Delte at current cursor position + Vector& modifyText = mImpl->mLogicalModel->mText; + CharacterIndex& cursorIndex = mImpl->mTextInput->mPrimaryCursorPosition; + + if( cursorIndex > 0 && + cursorIndex-1 < modifyText.Count() ) + { + modifyText.Remove( modifyText.Begin() + cursorIndex - 1 ); - // Discard temporary text - text.clear(); + // Cursor position retreat + --cursorIndex; } + // The natural size needs to be re-calculated. + mImpl->mRecalculateNaturalSize = true; + + // Apply modifications to the model; TODO - Optimize this + mImpl->mOperationsPending = ALL_OPERATIONS; + UpdateModel( ALL_OPERATIONS ); + mImpl->mOperationsPending = static_cast( LAYOUT | + ALIGN | + UPDATE_ACTUAL_SIZE | + REORDER ); + + // Queue a cursor reposition event; this must wait until after DoRelayout() + mImpl->mTextInput->mUpdateCursorPosition = true; +} + +void Controller::UpdateModel( OperationsMask operationsRequired ) +{ + // Calculate the operations to be done. + const OperationsMask operations = static_cast( mImpl->mOperationsPending & operationsRequired ); + + Vector& utf32Characters = mImpl->mLogicalModel->mText; + const Length numberOfCharacters = mImpl->mLogicalModel->GetNumberOfCharacters(); - Vector lineBreakInfo; + Vector& lineBreakInfo = mImpl->mLogicalModel->mLineBreakInfo; if( GET_LINE_BREAKS & operations ) { // Retrieves the line break info. The line break info is used to split the text in 'paragraphs' to // calculate the bidirectional info for each 'paragraph'. // It's also used to layout the text (where it should be a new line) or to shape the text (text in different lines // is not shaped together). - lineBreakInfo.Resize( characterCount, TextAbstraction::LINE_NO_BREAK ); + lineBreakInfo.Resize( numberOfCharacters, TextAbstraction::LINE_NO_BREAK ); SetLineBreakInfo( utf32Characters, lineBreakInfo ); - - mImpl->mLogicalModel->SetLineBreakInfo( lineBreakInfo.Begin(), characterCount ); } - Vector wordBreakInfo; + Vector& wordBreakInfo = mImpl->mLogicalModel->mWordBreakInfo; if( GET_WORD_BREAKS & operations ) { // Retrieves the word break info. The word break info is used to layout the text (where to wrap the text in lines). - wordBreakInfo.Resize( characterCount, TextAbstraction::WORD_NO_BREAK ); + wordBreakInfo.Resize( numberOfCharacters, TextAbstraction::WORD_NO_BREAK ); SetWordBreakInfo( utf32Characters, wordBreakInfo ); - - mImpl->mLogicalModel->SetWordBreakInfo( wordBreakInfo.Begin(), characterCount ); } const bool getScripts = GET_SCRIPTS & operations; const bool validateFonts = VALIDATE_FONTS & operations; - Vector scripts; - Vector validFonts; + Vector& scripts = mImpl->mLogicalModel->mScriptRuns; + Vector& validFonts = mImpl->mLogicalModel->mFontRuns; if( getScripts || validateFonts ) { @@ -740,69 +1156,36 @@ bool Controller::DoRelayout( const Vector2& size, multilanguageSupport.SetScripts( utf32Characters, lineBreakInfo, scripts ); - - // Sets the scripts into the model. - mImpl->mLogicalModel->SetScripts( scripts.Begin(), scripts.Count() ); } if( validateFonts ) { - // Copy the requested font defaults received via the property system. - // These may not be valid i.e. may not contain glyphs for the necessary scripts. - GetDefaultFonts( validFonts, numberOfCharacters ); + if( 0u == validFonts.Count() ) + { + // Copy the requested font defaults received via the property system. + // These may not be valid i.e. may not contain glyphs for the necessary scripts. + GetDefaultFonts( validFonts, numberOfCharacters ); + } // Validates the fonts. If there is a character with no assigned font it sets a default one. // After this call, fonts are validated. multilanguageSupport.ValidateFonts( utf32Characters, scripts, validFonts ); - - // Sets the fonts into the model. - mImpl->mLogicalModel->SetFonts( validFonts.Begin(), validFonts.Count() ); } } - Vector bidirectionalInfo; + Vector mirroredUtf32Characters; + bool textMirrored = false; if( BIDI_INFO & operations ) { - // Some vectors with data needed to get the paragraph's bidirectional info may be void - // after the first time the text has been laid out. - // Fill the vectors again. - - if( 0u == utf32Characters.Count() ) - { - utf32Characters.Resize( numberOfCharacters ); - - mImpl->mLogicalModel->GetText( utf32Characters.Begin(), - 0u, - numberOfCharacters ); - } - - if( 0u == lineBreakInfo.Count() ) - { - lineBreakInfo.Resize( numberOfCharacters ); - - mImpl->mLogicalModel->GetLineBreakInfo( lineBreakInfo.Begin(), - 0u, - numberOfCharacters ); - } - - if( 0u == scripts.Count() ) - { - scripts.Resize( mImpl->mLogicalModel->GetNumberOfScriptRuns( 0u, - numberOfCharacters ) ); - mImpl->mLogicalModel->GetScriptRuns( scripts.Begin(), - 0u, - numberOfCharacters ); - } - // Count the number of LINE_NO_BREAK to reserve some space for the vector of paragraph's // bidirectional info. Length numberOfParagraphs = 0u; const TextAbstraction::LineBreakInfo* lineBreakInfoBuffer = lineBreakInfo.Begin(); - for( Length index = 0u; index < characterCount; ++index ) + for( Length index = 0u; index < numberOfCharacters; ++index ) { if( TextAbstraction::LINE_NO_BREAK == *( lineBreakInfoBuffer + index ) ) { @@ -810,6 +1193,7 @@ bool Controller::DoRelayout( const Vector2& size, } } + Vector& bidirectionalInfo = mImpl->mLogicalModel->mBidirectionalParagraphInfo; bidirectionalInfo.Reserve( numberOfParagraphs ); // Calculates the bidirectional info for the whole paragraph if it contains right to left scripts. @@ -818,26 +1202,23 @@ bool Controller::DoRelayout( const Vector2& size, lineBreakInfo, bidirectionalInfo ); - mImpl->mLogicalModel->SetBidirectionalInfo( bidirectionalInfo.Begin(), - bidirectionalInfo.Count() ); + if( 0u != bidirectionalInfo.Count() ) + { + // This paragraph has right to left text. Some characters may need to be mirrored. + // TODO: consider if the mirrored string can be stored as well. + + textMirrored = GetMirroredText( utf32Characters, mirroredUtf32Characters ); + } } - Vector glyphs; - Vector glyphsToCharactersMap; - Vector charactersPerGlyph; + Vector& glyphs = mImpl->mVisualModel->mGlyphs; + Vector& glyphsToCharactersMap = mImpl->mVisualModel->mGlyphsToCharacters; + Vector& charactersPerGlyph = mImpl->mVisualModel->mCharactersPerGlyph; if( SHAPE_TEXT & operations ) { - if( 0u == validFonts.Count() ) - { - validFonts.Resize( mImpl->mLogicalModel->GetNumberOfFontRuns( 0u, - numberOfCharacters ) ); - mImpl->mLogicalModel->GetFontRuns( validFonts.Begin(), - 0u, - numberOfCharacters ); - } - + const Vector& textToShape = textMirrored ? mirroredUtf32Characters : utf32Characters; // Shapes the text. - ShapeText( utf32Characters, + ShapeText( textToShape, lineBreakInfo, scripts, validFonts, @@ -846,20 +1227,29 @@ bool Controller::DoRelayout( const Vector2& size, charactersPerGlyph ); } + const Length numberOfGlyphs = glyphs.Count(); + if( GET_GLYPH_METRICS & operations ) { - mImpl->mFontClient.GetGlyphMetrics( glyphs.Begin(), glyphs.Count() ); + mImpl->mFontClient.GetGlyphMetrics( glyphs.Begin(), numberOfGlyphs ); } - Length numberOfGlyphs = glyphs.Count(); if( 0u != numberOfGlyphs ) { - // Sets the glyphs into the model. - mImpl->mVisualModel->SetGlyphs( glyphs.Begin(), - glyphsToCharactersMap.Begin(), - charactersPerGlyph.Begin(), - numberOfGlyphs ); + // Create the glyph to character conversion table and the 'number of glyphs' per character. + mImpl->mVisualModel->CreateCharacterToGlyphTable(numberOfCharacters ); + mImpl->mVisualModel->CreateGlyphsPerCharacterTable( numberOfCharacters ); } +} + +bool Controller::DoRelayout( const Vector2& size, + OperationsMask operationsRequired, + Size& layoutSize ) +{ + bool viewUpdated( false ); + + // Calculate the operations to be done. + const OperationsMask operations = static_cast( mImpl->mOperationsPending & operationsRequired ); if( LAYOUT & operations ) { @@ -867,51 +1257,17 @@ bool Controller::DoRelayout( const Vector2& size, // after the first time the text has been laid out. // Fill the vectors again. - const Length numberOfCharacters = mImpl->mLogicalModel->GetNumberOfCharacters(); - numberOfGlyphs = mImpl->mVisualModel->GetNumberOfGlyphs(); + Length numberOfGlyphs = mImpl->mVisualModel->GetNumberOfGlyphs(); - if( 0u == lineBreakInfo.Count() ) - { - lineBreakInfo.Resize( numberOfCharacters ); - mImpl->mLogicalModel->GetLineBreakInfo( lineBreakInfo.Begin(), - 0u, - numberOfCharacters ); - } - - if( 0u == wordBreakInfo.Count() ) - { - wordBreakInfo.Resize( numberOfCharacters ); - mImpl->mLogicalModel->GetWordBreakInfo( wordBreakInfo.Begin(), - 0u, - numberOfCharacters ); - } - - if( 0u == glyphs.Count() ) - { - glyphs.Resize( numberOfGlyphs ); - mImpl->mVisualModel->GetGlyphs( glyphs.Begin(), - 0u, - numberOfGlyphs ); - } - - if( 0u == glyphsToCharactersMap.Count() ) - { - glyphsToCharactersMap.Resize( numberOfGlyphs ); - mImpl->mVisualModel->GetGlyphToCharacterMap( glyphsToCharactersMap.Begin(), - 0u, - numberOfGlyphs ); - } - - if( 0u == charactersPerGlyph.Count() ) - { - charactersPerGlyph.Resize( numberOfGlyphs ); - mImpl->mVisualModel->GetCharactersPerGlyphMap( charactersPerGlyph.Begin(), - 0u, - numberOfGlyphs ); - } + Vector& lineBreakInfo = mImpl->mLogicalModel->mLineBreakInfo; + Vector& wordBreakInfo = mImpl->mLogicalModel->mWordBreakInfo; + Vector& glyphs = mImpl->mVisualModel->mGlyphs; + Vector& glyphsToCharactersMap = mImpl->mVisualModel->mGlyphsToCharacters; + Vector& charactersPerGlyph = mImpl->mVisualModel->mCharactersPerGlyph; // Set the layout parameters. LayoutParameters layoutParameters( size, + mImpl->mLogicalModel->mText.Begin(), lineBreakInfo.Begin(), wordBreakInfo.Begin(), numberOfGlyphs, @@ -919,16 +1275,21 @@ bool Controller::DoRelayout( const Vector2& size, glyphsToCharactersMap.Begin(), charactersPerGlyph.Begin() ); - // Reserve space to set the positions of the glyphs. - Vector glyphPositions; - glyphPositions.Resize( numberOfGlyphs ); - // The laid-out lines. // It's not possible to know in how many lines the text is going to be laid-out, // but it can be resized at least with the number of 'paragraphs' to avoid // some re-allocations. - Vector lines; - lines.Reserve( mImpl->mLogicalModel->GetNumberOfBidirectionalInfoRuns( 0u, numberOfCharacters ) ); + Vector& lines = mImpl->mVisualModel->mLines; + + // Delete any previous laid out lines before setting the new ones. + lines.Clear(); + + // The capacity of the bidirectional paragraph info is the number of paragraphs. + lines.Reserve( mImpl->mLogicalModel->mBidirectionalParagraphInfo.Capacity() ); + + // Resize the vector of positions to have the same size than the vector of glyphs. + Vector& glyphPositions = mImpl->mVisualModel->mGlyphPositions; + glyphPositions.Resize( numberOfGlyphs ); // Update the visual model. viewUpdated = mImpl->mLayoutEngine.LayoutText( layoutParameters, @@ -941,15 +1302,7 @@ bool Controller::DoRelayout( const Vector2& size, // Reorder the lines if( REORDER & operations ) { - const Length numberOfBidiParagraphs = mImpl->mLogicalModel->GetNumberOfBidirectionalInfoRuns( 0u, numberOfCharacters ); - - if( 0u == bidirectionalInfo.Count() ) - { - bidirectionalInfo.Resize( numberOfBidiParagraphs ); - mImpl->mLogicalModel->GetBidirectionalInfo( bidirectionalInfo.Begin(), - 0u, - numberOfCharacters ); - } + Vector& bidirectionalInfo = mImpl->mLogicalModel->mBidirectionalParagraphInfo; // Check first if there are paragraphs with bidirectional info. if( 0u != bidirectionalInfo.Count() ) @@ -974,22 +1327,10 @@ bool Controller::DoRelayout( const Vector2& size, layoutParameters.numberOfBidirectionalInfoRuns = numberOfBidirectionalInfoRuns; // Get the character to glyph conversion table and set into the layout. - Vector characterToGlyphMap; - characterToGlyphMap.Resize( numberOfCharacters ); - - layoutParameters.charactersToGlyphsBuffer = characterToGlyphMap.Begin(); - mImpl->mVisualModel->GetCharacterToGlyphMap( layoutParameters.charactersToGlyphsBuffer, - 0u, - numberOfCharacters ); + layoutParameters.charactersToGlyphsBuffer = mImpl->mVisualModel->mCharactersToGlyph.Begin(); // Get the glyphs per character table and set into the layout. - Vector glyphsPerCharacter; - glyphsPerCharacter.Resize( numberOfCharacters ); - - layoutParameters.glyphsPerCharacterBuffer = glyphsPerCharacter.Begin(); - mImpl->mVisualModel->GetGlyphsPerCharacterMap( layoutParameters.glyphsPerCharacterBuffer, - 0u, - numberOfCharacters ); + layoutParameters.glyphsPerCharacterBuffer = mImpl->mVisualModel->mGlyphsPerCharacter.Begin(); // Re-layout the text. Reorder those lines with right to left characters. mImpl->mLayoutEngine.ReLayoutRightToLeftLines( layoutParameters, @@ -1006,20 +1347,13 @@ bool Controller::DoRelayout( const Vector2& size, free( bidiLineInfo.visualToLogicalMap ); } } - } + } // REORDER - // Sets the positions into the model. - if( UPDATE_POSITIONS & operations ) + if( ALIGN & operations ) { - mImpl->mVisualModel->SetGlyphPositions( glyphPositions.Begin(), - numberOfGlyphs ); - } - - // Sets the lines into the model. - if( UPDATE_LINES & operations ) - { - mImpl->mVisualModel->SetLines( lines.Begin(), - lines.Count() ); + mImpl->mLayoutEngine.Align( layoutParameters, + lines, + glyphPositions ); } // Sets the actual size. @@ -1027,7 +1361,7 @@ bool Controller::DoRelayout( const Vector2& size, { mImpl->mVisualModel->SetActualSize( layoutSize ); } - } + } // view updated } else { @@ -1037,87 +1371,6 @@ bool Controller::DoRelayout( const Vector2& size, return viewUpdated; } -Vector3 Controller::GetNaturalSize() -{ - Vector3 naturalSize; - - if( mImpl->mRecalculateNaturalSize ) - { - // Operations that can be done only once until the text changes. - const OperationsMask onlyOnceOperations = static_cast( CONVERT_TO_UTF32 | - GET_SCRIPTS | - VALIDATE_FONTS | - GET_LINE_BREAKS | - GET_WORD_BREAKS | - SHAPE_TEXT | - GET_GLYPH_METRICS ); - - // Operations that need to be done if the size changes. - const OperationsMask sizeOperations = static_cast( LAYOUT | - REORDER ); - - DoRelayout( Size( MAX_FLOAT, MAX_FLOAT ), - static_cast( onlyOnceOperations | - sizeOperations ), - naturalSize.GetVectorXY() ); - - // Do not do again the only once operations. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending & ~onlyOnceOperations ); - - // Do the size related operations again. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | sizeOperations ); - - // Stores the natural size to avoid recalculate it again - // unless the text/style changes. - mImpl->mVisualModel->SetNaturalSize( naturalSize.GetVectorXY() ); - - mImpl->mRecalculateNaturalSize = false; - } - else - { - naturalSize = mImpl->mVisualModel->GetNaturalSize(); - } - - return naturalSize; -} - -float Controller::GetHeightForWidth( float width ) -{ - Size layoutSize; - if( width != mImpl->mControlSize.width ) - { - // Operations that can be done only once until the text changes. - const OperationsMask onlyOnceOperations = static_cast( CONVERT_TO_UTF32 | - GET_SCRIPTS | - VALIDATE_FONTS | - GET_LINE_BREAKS | - GET_WORD_BREAKS | - SHAPE_TEXT | - GET_GLYPH_METRICS ); - - // Operations that need to be done if the size changes. - const OperationsMask sizeOperations = static_cast( LAYOUT | - REORDER ); - - DoRelayout( Size( width, MAX_FLOAT ), - static_cast( onlyOnceOperations | - sizeOperations ), - layoutSize ); - - // Do not do again the only once operations. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending & ~onlyOnceOperations ); - - // Do the size related operations again. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | sizeOperations ); - } - else - { - layoutSize = mImpl->mVisualModel->GetActualSize(); - } - - return layoutSize.height; -} - View& Controller::GetView() { return mImpl->mView; @@ -1163,21 +1416,42 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) { DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected KeyEvent" ); - if( mImpl->mTextInput ) + if( mImpl->mTextInput && + keyEvent.state == KeyEvent::Down ) { - TextInput::Event event( TextInput::KEY_EVENT ); - event.p1.mInt = keyEvent.keyCode; - event.p2.mString = NULL; - + int keyCode = keyEvent.keyCode; const std::string& keyString = keyEvent.keyPressed; - if ( !keyString.empty() ) + + // Pre-process to separate modifying events from non-modifying input events. + if( Dali::DALI_KEY_ESCAPE == keyCode ) { - event.p2.mString = new char[keyString.size() + 1]; - std::copy(keyString.begin(), keyString.end(), event.p2.mString); - event.p2.mString[keyString.size()] = '\0'; + // Escape key is a special case which causes focus loss + KeyboardFocusLostEvent(); + } + else if( Dali::DALI_KEY_CURSOR_LEFT == keyCode || + Dali::DALI_KEY_CURSOR_RIGHT == keyCode || + Dali::DALI_KEY_CURSOR_UP == keyCode || + Dali::DALI_KEY_CURSOR_DOWN == keyCode ) + { + TextInput::Event event( TextInput::CURSOR_KEY_EVENT ); + event.p1.mInt = keyCode; + mImpl->mTextInput->mEventQueue.push_back( event ); + } + else if( Dali::DALI_KEY_BACKSPACE == keyCode ) + { + // Queue a delete event + ModifyEvent event; + event.type = DELETE_TEXT; + mImpl->mModifyEvents.push_back( event ); + } + else if( !keyString.empty() ) + { + // Queue an insert event + ModifyEvent event; + event.type = INSERT_TEXT; + event.text = keyString; + mImpl->mModifyEvents.push_back( event ); } - - mImpl->mTextInput->mEventQueue.push_back( event ); RequestRelayout(); } @@ -1201,6 +1475,22 @@ void Controller::TapEvent( unsigned int tapCount, float x, float y ) } } +void Controller::PanEvent( Gesture::State state, const Vector2& displacement ) +{ + DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected PanEvent" ); + + if( mImpl->mTextInput ) + { + TextInput::Event event( TextInput::PAN_EVENT ); + event.p1.mInt = state; + event.p2.mFloat = displacement.x; + event.p3.mFloat = displacement.y; + mImpl->mTextInput->mEventQueue.push_back( event ); + + RequestRelayout(); + } +} + void Controller::GrabHandleEvent( GrabHandleState state, float x, float y ) { DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected GrabHandleEvent" );