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=02486bf148d62856f3e2995a6541bfcba5a92660;hp=2a3631fe8bd45d5d15e394f6f0ee8454f3226d11;hb=c11c7538e070434e84856ebd4af000dff4ca3f9a;hpb=c25b3c40178dadf12dc5e8f77c17413df0a55099 diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 2a3631f..02486bf 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -20,44 +20,25 @@ // EXTERNAL INCLUDES #include -#include #include -#include // INTERNAL INCLUDES #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(); -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; -}; - const std::string EMPTY_STRING(""); } // namespace @@ -71,946 +52,6 @@ namespace Toolkit namespace Text { -struct Controller::FontDefaults -{ - FontDefaults() - : mDefaultPointSize(0.0f), - mFontId(0u) - { - } - - FontId GetFontId( TextAbstraction::FontClient& fontClient ) - { - if( !mFontId ) - { - Dali::TextAbstraction::PointSize26Dot6 pointSize = mDefaultPointSize*64; - mFontId = fontClient.GetFontId( mDefaultFontFamily, mDefaultFontStyle, pointSize ); - } - - return mFontId; - } - - std::string mDefaultFontFamily; - std::string mDefaultFontStyle; - float mDefaultPointSize; - FontId mFontId; -}; - -struct Controller::TextInput -{ - // Used to queue input events until DoRelayout() - enum EventType - { - KEYBOARD_FOCUS_GAIN_EVENT, - KEYBOARD_FOCUS_LOST_EVENT, - CURSOR_KEY_EVENT, - TAP_EVENT, - PAN_EVENT, - GRAB_HANDLE_EVENT - }; - - union Param - { - int mInt; - unsigned int mUint; - float mFloat; - }; - - struct Event - { - Event( EventType eventType ) - : type( eventType ) - { - p1.mInt = 0; - p2.mInt = 0; - } - - EventType type; - Param p1; - Param p2; - Param p3; - }; - - struct CursorInfo - { - CursorInfo() - : primaryPosition(), - secondaryPosition(), - lineHeight( 0.f ), - primaryCursorHeight( 0.f ), - secondaryCursorHeight( 0.f ), - isSecondaryCursor( false ) - {} - - ~CursorInfo() - {} - - Vector2 primaryPosition; ///< The primary cursor's position. - Vector2 secondaryPosition; ///< The secondary cursor's position. - float lineHeight; ///< The height of the line where the cursor is placed. - float primaryCursorHeight; ///< The primary cursor's height. - float secondaryCursorHeight; ///< The secondary cursor's height. - bool isSecondaryCursor; ///< Whether the secondary cursor is valid. - }; - - /** - * @brief Some characters can be shaped in more than one glyph. - * This struct is used to retrieve metrics from these group of glyphs. - */ - struct GlyphMetrics - { - GlyphMetrics() - : fontHeight( 0.f ), - advance( 0.f ), - ascender( 0.f ), - xBearing( 0.f ) - {} - - ~GlyphMetrics() - {} - - float fontHeight; ///< The font's height of that glyphs. - float advance; ///< The sum of all the advances of all the glyphs. - float ascender; ///< The font's ascender. - float xBearing; ///< The x bearing of the first glyph. - }; - - enum State - { - INACTIVE, - SELECTING, - EDITING, - EDITING_WITH_POPUP - }; - - TextInput( LogicalModelPtr logicalModel, - VisualModelPtr visualModel, - DecoratorPtr decorator, - FontDefaults* fontDefaults, - TextAbstraction::FontClient& fontClient ) - : mLogicalModel( logicalModel ), - mVisualModel( visualModel ), - mDecorator( decorator ), - mFontDefaults( fontDefaults ), - mFontClient( fontClient ), - mState( INACTIVE ), - mPrimaryCursorPosition( 0u ), - mSecondaryCursorPosition( 0u ), - mDecoratorUpdated( false ), - mCursorBlinkEnabled( true ), - mGrabHandleEnabled( true ), - mGrabHandlePopupEnabled( true ), - mSelectionEnabled( true ), - mHorizontalScrollingEnabled( true ), - mVerticalScrollingEnabled( false ), - mUpdateCursorPosition( false ) - {} - - /** - * @brief Helper to move the cursor, grab handle etc. - */ - bool ProcessInputEvents( const Vector2& controlSize, - const Vector2& alignmentOffset ) - { - mDecoratorUpdated = false; - - if( mDecorator ) - { - for( vector::iterator iter = mEventQueue.begin(); iter != mEventQueue.end(); ++iter ) - { - switch( iter->type ) - { - case KEYBOARD_FOCUS_GAIN_EVENT: - { - OnKeyboardFocus( true ); - break; - } - case KEYBOARD_FOCUS_LOST_EVENT: - { - OnKeyboardFocus( false ); - break; - } - case CURSOR_KEY_EVENT: - { - OnCursorKeyEvent( *iter ); - break; - } - case TAP_EVENT: - { - OnTapEvent( *iter, alignmentOffset ); - break; - } - case PAN_EVENT: - { - OnPanEvent( *iter, controlSize, alignmentOffset ); - break; - } - case GRAB_HANDLE_EVENT: - { - OnGrabHandleEvent( *iter ); - break; - } - } - } - } - - // The cursor must also be repositioned after inserts into the model - if( mUpdateCursorPosition ) - { - UpdateCursorPosition(); - mUpdateCursorPosition = false; - } - - mEventQueue.clear(); - - return mDecoratorUpdated; - } - - void OnKeyboardFocus( bool hasFocus ) - { - if( !hasFocus ) - { - ChangeState( INACTIVE ); - } - else - { - ChangeState( EDITING ); - } - } - - void OnCursorKeyEvent( const Event& event ) - { - int keyCode = event.p1.mInt; - - if( Dali::DALI_KEY_CURSOR_LEFT == keyCode ) - { - if( mPrimaryCursorPosition > 0u ) - { - mPrimaryCursorPosition = CalculateNewCursorIndex( mPrimaryCursorPosition - 1u ); - } - } - else if( Dali::DALI_KEY_CURSOR_RIGHT == keyCode ) - { - if( mLogicalModel->GetNumberOfCharacters() > mPrimaryCursorPosition ) - { - mPrimaryCursorPosition = CalculateNewCursorIndex( mPrimaryCursorPosition ); - } - } - else if( Dali::DALI_KEY_CURSOR_UP == keyCode ) - { - // TODO - } - else if( Dali::DALI_KEY_CURSOR_DOWN == keyCode ) - { - // TODO - } - - UpdateCursorPosition(); - } - - void HandleCursorKey( int keyCode ) - { - // TODO - } - - void OnTapEvent( const Event& event, - const Vector2& alignmentOffset ) - { - unsigned int tapCount = event.p1.mUint; - - if( 1u == tapCount ) - { - ChangeState( EDITING ); - - float xPosition = event.p2.mFloat - alignmentOffset.x; - float yPosition = event.p3.mFloat - alignmentOffset.y; - - mPrimaryCursorPosition = GetClosestCursorIndex( xPosition, - yPosition ); - - UpdateCursorPosition(); - } - else if( mSelectionEnabled && - 2u == tapCount ) - { - ChangeState( SELECTING ); - - RepositionSelectionHandles( event.p2.mFloat, event.p3.mFloat ); - } - } - - void OnPanEvent( const Event& event, - const Vector2& controlSize, - const Vector2& alignmentOffset ) - { - int state = event.p1.mInt; - - if( Gesture::Started == state || - Gesture::Continuing == state ) - { - const Vector2& actualSize = mVisualModel->GetActualSize(); - - if( mHorizontalScrollingEnabled ) - { - const float displacementX = event.p2.mFloat; - mScrollPosition.x += displacementX; - - // 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; - } - else - { - mScrollPosition.x = 0.f; - } - } - - if( mVerticalScrollingEnabled ) - { - const float displacementY = event.p3.mFloat; - mScrollPosition.y += displacementY; - - // 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; - } - else - { - mScrollPosition.y = 0.f; - } - } - } - } - - void OnGrabHandleEvent( const Event& event ) - { - unsigned int state = event.p1.mUint; - - if( GRAB_HANDLE_PRESSED == state ) - { - float xPosition = event.p2.mFloat + mScrollPosition.x; - float yPosition = event.p3.mFloat + mScrollPosition.y; - - mPrimaryCursorPosition = GetClosestCursorIndex( xPosition, - yPosition ); - - UpdateCursorPosition(); - - //mDecorator->HidePopup(); - ChangeState ( EDITING ); - } - else if ( mGrabHandlePopupEnabled && - GRAB_HANDLE_RELEASED == state ) - { - //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].ascender + -lines[0].descender : 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 ); - } - } - - void ChangeState( State newState ) - { - if( mState != newState ) - { - mState = newState; - - if( INACTIVE == mState ) - { - mDecorator->SetActiveCursor( ACTIVE_CURSOR_NONE ); - mDecorator->StopCursorBlink(); - mDecorator->SetGrabHandleActive( false ); - mDecorator->SetSelectionActive( false ); - mDecorator->SetPopupActive( false ); - mDecoratorUpdated = true; - } - else if ( SELECTING == mState ) - { - mDecorator->SetActiveCursor( ACTIVE_CURSOR_NONE ); - mDecorator->StopCursorBlink(); - mDecorator->SetGrabHandleActive( false ); - mDecorator->SetSelectionActive( true ); - mDecoratorUpdated = true; - } - else if( EDITING == mState ) - { - mDecorator->SetActiveCursor( ACTIVE_CURSOR_PRIMARY ); - if( mCursorBlinkEnabled ) - { - mDecorator->StartCursorBlink(); - } - if( mGrabHandleEnabled ) - { - 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; - } - } - } - - LineIndex GetClosestLine( float y ) const - { - float totalHeight = 0.f; - LineIndex lineIndex = 0u; - - const Vector& lines = mVisualModel->mLines; - for( LineIndex endLine = lines.Count(); - lineIndex < endLine; - ++lineIndex ) - { - const LineRun& lineRun = lines[lineIndex]; - totalHeight += lineRun.ascender + -lineRun.descender; - if( y < totalHeight ) - { - return lineIndex; - } - } - - return lineIndex-1; - } - - /** - * @brief Retrieves the cursor's logical position for a given touch point x,y - * - * @param[in] visualX The touch point x. - * @param[in] visualY The touch point y. - * - * @return The logical cursor position (in characters). 0 is just before the first character, a value equal to the number of characters is just after the last character. - */ - CharacterIndex GetClosestCursorIndex( float visualX, - float visualY ) const - { - CharacterIndex logicalIndex = 0u; - - const Length numberOfGlyphs = mVisualModel->mGlyphs.Count(); - const Length numberOfLines = mVisualModel->mLines.Count(); - if( 0 == numberOfGlyphs || - 0 == numberOfLines ) - { - return logicalIndex; - } - - // Transform to visual model coords - visualX -= mScrollPosition.x; - visualY -= mScrollPosition.y; - - // Find which line is closest - const LineIndex lineIndex = GetClosestLine( visualY ); - const LineRun& line = mVisualModel->mLines[lineIndex]; - - // Get the positions of the glyphs. - const Vector& positions = mVisualModel->mGlyphPositions; - const Vector2* const positionsBuffer = positions.Begin(); - - // Get the visual to logical conversion tables. - const CharacterIndex* const visualToLogicalBuffer = ( 0u != mLogicalModel->mVisualToLogicalMap.Count() ) ? mLogicalModel->mVisualToLogicalMap.Begin() : NULL; - const CharacterIndex* const visualToLogicalCursorBuffer = mLogicalModel->mVisualToLogicalCursorMap.Begin(); - - // Get the character to glyph conversion table. - const GlyphIndex* const charactersToGlyphBuffer = mVisualModel->mCharactersToGlyph.Begin(); - - // Get the glyphs per character table. - const Length* const glyphsPerCharacterBuffer = mVisualModel->mGlyphsPerCharacter.Begin(); - - // If the vector is void, there is no right to left characters. - const bool hasRightToLeftCharacters = NULL != visualToLogicalBuffer; - - const CharacterIndex startCharacter = line.characterRun.characterIndex; - const CharacterIndex endCharacter = line.characterRun.characterIndex + line.characterRun.numberOfCharacters; - DALI_ASSERT_DEBUG( endCharacter <= mLogicalModel->mText.Count() && "Invalid line info" ); - - // Whether there is a hit on a glyph. - bool matched = false; - - // Traverses glyphs in visual order. To do that use the visual to logical conversion table. - CharacterIndex visualIndex = startCharacter; - for( ; !matched && ( visualIndex < endCharacter ); ++visualIndex ) - { - // The character in logical order. - const CharacterIndex characterLogicalOrderIndex = hasRightToLeftCharacters ? *( visualToLogicalBuffer + visualIndex ) : visualIndex; - - // The first glyph for that character in logical order. - const GlyphIndex glyphLogicalOrderIndex = *( charactersToGlyphBuffer + characterLogicalOrderIndex ); - - // The number of glyphs for that character - const Length numberOfGlyphs = *( glyphsPerCharacterBuffer + characterLogicalOrderIndex ); - - // Get the metrics for the group of glyphs. - GlyphMetrics glyphMetrics; - GetGlyphsMetrics( glyphLogicalOrderIndex, - numberOfGlyphs, - glyphMetrics ); - - const Vector2& position = *( positionsBuffer + glyphLogicalOrderIndex ); - - const float glyphX = -glyphMetrics.xBearing + position.x + 0.5f * glyphMetrics.advance; - - if( visualX < glyphX ) - { - matched = true; - break; - } - } - - // Return the logical position of the cursor in characters. - - if( !matched ) - { - visualIndex = endCharacter; - } - - return hasRightToLeftCharacters ? *( visualToLogicalCursorBuffer + visualIndex ) : visualIndex; - } - - /** - * @brief Calculates the cursor's position for a given character index in the logical order. - * - * It retrieves as well the line's height and the cursor's height and - * if there is a valid alternative cursor, its position and height. - * - * @param[in] logical The logical cursor position (in characters). 0 is just before the first character, a value equal to the number of characters is just after the last character. - * @param[out] cursorInfo The line's height, the cursor's height, the cursor's position and whether there is an alternative cursor. - */ - void GetCursorPosition( CharacterIndex logical, - CursorInfo& cursorInfo ) const - { - // TODO: Check for multiline with \n, etc... - - // Check if the logical position is the first or the last one of the text. - const bool isFirstPosition = 0u == logical; - const bool isLastPosition = mLogicalModel->GetNumberOfCharacters() == logical; - - if( isFirstPosition && isLastPosition ) - { - // There is zero characters. Get the default font. - - FontId defaultFontId = 0u; - if( NULL == mFontDefaults ) - { - defaultFontId = mFontClient.GetFontId( EMPTY_STRING, - EMPTY_STRING ); - } - else - { - defaultFontId = mFontDefaults->GetFontId( mFontClient ); - } - - Text::FontMetrics fontMetrics; - mFontClient.GetFontMetrics( defaultFontId, fontMetrics ); - - cursorInfo.lineHeight = fontMetrics.ascender - fontMetrics.descender; - cursorInfo.primaryCursorHeight = cursorInfo.lineHeight; - - cursorInfo.primaryPosition.x = 0.f; - cursorInfo.primaryPosition.y = 0.f; - - // Nothing else to do. - return; - } - - // Get the previous logical index. - const CharacterIndex previousLogical = isFirstPosition ? 0u : logical - 1u; - - // Decrease the logical index if it's the last one. - if( isLastPosition ) - { - --logical; - } - - // Get the direction of the character and the previous one. - const CharacterDirection* const modelCharacterDirectionsBuffer = ( 0u != mLogicalModel->mCharacterDirections.Count() ) ? mLogicalModel->mCharacterDirections.Begin() : NULL; - - CharacterDirection isCurrentRightToLeft = false; - CharacterDirection isPreviousRightToLeft = false; - if( NULL != modelCharacterDirectionsBuffer ) // If modelCharacterDirectionsBuffer is NULL, it means the whole text is left to right. - { - isCurrentRightToLeft = *( modelCharacterDirectionsBuffer + logical ); - isPreviousRightToLeft = *( modelCharacterDirectionsBuffer + previousLogical ); - } - - // Get the line where the character is laid-out. - const LineRun* modelLines = mVisualModel->mLines.Begin(); - - const LineIndex lineIndex = mVisualModel->GetLineOfCharacter( logical ); - const LineRun& line = *( modelLines + lineIndex ); - - // Get the paragraph's direction. - const CharacterDirection isRightToLeftParagraph = line.direction; - - // Check whether there is an alternative position: - - cursorInfo.isSecondaryCursor = ( isCurrentRightToLeft != isPreviousRightToLeft ) || - ( isLastPosition && ( isRightToLeftParagraph != isCurrentRightToLeft ) ); - - // Set the line height. - cursorInfo.lineHeight = line.ascender + -line.descender; - - // Convert the cursor position into the glyph position. - CharacterIndex characterIndex = logical; - if( cursorInfo.isSecondaryCursor && - ( isRightToLeftParagraph != isCurrentRightToLeft ) ) - { - characterIndex = previousLogical; - } - - const GlyphIndex currentGlyphIndex = *( mVisualModel->mCharactersToGlyph.Begin() + characterIndex ); - const Length numberOfGlyphs = *( mVisualModel->mGlyphsPerCharacter.Begin() + characterIndex ); - const Length numberOfCharacters = *( mVisualModel->mCharactersPerGlyph.Begin() +currentGlyphIndex ); - - // Get the metrics for the group of glyphs. - GlyphMetrics glyphMetrics; - GetGlyphsMetrics( currentGlyphIndex, - numberOfGlyphs, - glyphMetrics ); - - float interGlyphAdvance = 0.f; - if( !isLastPosition && - ( numberOfCharacters > 1u ) ) - { - const CharacterIndex firstIndex = *( mVisualModel->mGlyphsToCharacters.Begin() + currentGlyphIndex ); - interGlyphAdvance = static_cast( characterIndex - firstIndex ) * glyphMetrics.advance / static_cast( numberOfCharacters ); - } - - // Get the glyph position and x bearing. - const Vector2& currentPosition = *( mVisualModel->mGlyphPositions.Begin() + currentGlyphIndex ); - - // Set the cursor's height. - cursorInfo.primaryCursorHeight = glyphMetrics.fontHeight; - - // Set the position. - cursorInfo.primaryPosition.x = -glyphMetrics.xBearing + currentPosition.x + ( isCurrentRightToLeft ? glyphMetrics.advance : interGlyphAdvance ); - cursorInfo.primaryPosition.y = line.ascender - glyphMetrics.ascender; - - if( isLastPosition ) - { - // The position of the cursor after the last character needs special - // care depending on its direction and the direction of the paragraph. - - if( cursorInfo.isSecondaryCursor ) - { - // Need to find the first character after the last character with the paragraph's direction. - // i.e l0 l1 l2 r0 r1 should find r0. - - // TODO: check for more than one line! - characterIndex = isRightToLeftParagraph ? line.characterRun.characterIndex : line.characterRun.characterIndex + line.characterRun.numberOfCharacters - 1u; - characterIndex = mLogicalModel->GetLogicalCharacterIndex( characterIndex ); - - const GlyphIndex glyphIndex = *( mVisualModel->mCharactersToGlyph.Begin() + characterIndex ); - const Length numberOfGlyphs = *( mVisualModel->mGlyphsPerCharacter.Begin() + characterIndex ); - - const Vector2& position = *( mVisualModel->mGlyphPositions.Begin() + glyphIndex ); - - // Get the metrics for the group of glyphs. - GlyphMetrics glyphMetrics; - GetGlyphsMetrics( glyphIndex, - numberOfGlyphs, - glyphMetrics ); - - cursorInfo.primaryPosition.x = -glyphMetrics.xBearing + position.x + ( isRightToLeftParagraph ? 0.f : glyphMetrics.advance ); - - cursorInfo.primaryPosition.y = line.ascender - glyphMetrics.ascender; - } - else - { - if( !isCurrentRightToLeft ) - { - cursorInfo.primaryPosition.x += glyphMetrics.advance; - } - else - { - cursorInfo.primaryPosition.x -= glyphMetrics.advance; - } - } - } - - // Set the alternative cursor position. - if( cursorInfo.isSecondaryCursor ) - { - // Convert the cursor position into the glyph position. - const CharacterIndex previousCharacterIndex = ( ( isRightToLeftParagraph != isCurrentRightToLeft ) ? logical : previousLogical ); - const GlyphIndex previousGlyphIndex = *( mVisualModel->mCharactersToGlyph.Begin() + previousCharacterIndex ); - const Length numberOfGlyphs = *( mVisualModel->mGlyphsPerCharacter.Begin() + previousCharacterIndex ); - - // Get the glyph position. - const Vector2& previousPosition = *( mVisualModel->mGlyphPositions.Begin() + previousGlyphIndex ); - - // Get the metrics for the group of glyphs. - GlyphMetrics glyphMetrics; - GetGlyphsMetrics( previousGlyphIndex, - numberOfGlyphs, - glyphMetrics ); - - // Set the cursor position and height. - cursorInfo.secondaryPosition.x = -glyphMetrics.xBearing + previousPosition.x + ( ( ( isLastPosition && !isCurrentRightToLeft ) || - ( !isLastPosition && isCurrentRightToLeft ) ) ? glyphMetrics.advance : 0.f ); - - cursorInfo.secondaryCursorHeight = 0.5f * glyphMetrics.fontHeight; - - cursorInfo.secondaryPosition.y = cursorInfo.lineHeight - cursorInfo.secondaryCursorHeight - line.descender - ( glyphMetrics.fontHeight - glyphMetrics.ascender ); - - // Update the primary cursor height as well. - cursorInfo.primaryCursorHeight *= 0.5f; - } - } - - /** - * @brief Get some glyph's metrics of a group of glyphs formed as a result of shaping one character. - * - * @param[in] glyphIndex The index to the first glyph. - * @param[in] numberOfGlyphs The number of glyphs. - * @param[out] glyphMetrics Some glyph metrics (font height, advance, ascender and x bearing). - */ - void GetGlyphsMetrics( GlyphIndex glyphIndex, - Length numberOfGlyphs, - GlyphMetrics& glyphMetrics ) const - { - const GlyphInfo* glyphsBuffer = mVisualModel->mGlyphs.Begin(); - - const GlyphInfo& firstGlyph = *( glyphsBuffer + glyphIndex ); - - Text::FontMetrics fontMetrics; - mFontClient.GetFontMetrics( firstGlyph.fontId, fontMetrics ); - - glyphMetrics.fontHeight = fontMetrics.height; - glyphMetrics.advance = firstGlyph.advance; - glyphMetrics.ascender = fontMetrics.ascender; - glyphMetrics.xBearing = firstGlyph.xBearing; - - for( unsigned int i = 1u; i < numberOfGlyphs; ++i ) - { - const GlyphInfo& glyphInfo = *( glyphsBuffer + glyphIndex + i ); - - glyphMetrics.advance += glyphInfo.advance; - } - } - - /** - * @brief Calculates the new cursor index. - * - * It takes into account that in some scripts multiple characters can form a glyph and all of them - * need to be jumped with one key event. - * - * @param[in] index The initial new index. - * - * @return The new cursor index. - */ - CharacterIndex CalculateNewCursorIndex( CharacterIndex index ) const - { - CharacterIndex cursorIndex = mPrimaryCursorPosition; - - const Script script = mLogicalModel->GetScript( index ); - const GlyphIndex* charactersToGlyphBuffer = mVisualModel->mCharactersToGlyph.Begin(); - const Length* charactersPerGlyphBuffer = mVisualModel->mCharactersPerGlyph.Begin(); - - Length numberOfCharacters = 0u; - if( TextAbstraction::LATIN == script ) - { - // Prevents to jump the whole Latin ligatures like fi, ff, ... - numberOfCharacters = 1u; - } - else - { - GlyphIndex glyphIndex = *( charactersToGlyphBuffer + index ); - numberOfCharacters = *( charactersPerGlyphBuffer + glyphIndex ); - - while( 0u == numberOfCharacters ) - { - numberOfCharacters = *( charactersPerGlyphBuffer + glyphIndex ); - ++glyphIndex; - } - } - - if( index < mPrimaryCursorPosition ) - { - cursorIndex -= numberOfCharacters; - } - else - { - cursorIndex += numberOfCharacters; - } - - return cursorIndex; - } - - void UpdateCursorPosition() - { - CursorInfo cursorInfo; - - GetCursorPosition( mPrimaryCursorPosition, - cursorInfo ); - - mDecorator->SetPosition( PRIMARY_CURSOR, - cursorInfo.primaryPosition.x, - cursorInfo.primaryPosition.y, - cursorInfo.primaryCursorHeight, - cursorInfo.lineHeight ); - - if( cursorInfo.isSecondaryCursor ) - { - mDecorator->SetActiveCursor( ACTIVE_CURSOR_BOTH ); - mDecorator->SetPosition( SECONDARY_CURSOR, - cursorInfo.secondaryPosition.x, - cursorInfo.secondaryPosition.y, - cursorInfo.secondaryCursorHeight, - cursorInfo.lineHeight ); - } - else - { - mDecorator->SetActiveCursor( ACTIVE_CURSOR_PRIMARY ); - } - - mUpdateCursorPosition = false; - mDecoratorUpdated = true; - } - - LogicalModelPtr mLogicalModel; - VisualModelPtr mVisualModel; - DecoratorPtr mDecorator; - FontDefaults* mFontDefaults; - TextAbstraction::FontClient& mFontClient; - std::string mPlaceholderText; - - /** - * This is used to delay handling events until after the model has been updated. - * The number of updates to the model is minimized to improve performance. - */ - vector mEventQueue; ///< The queue of touch events etc. - - 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 - - /** - * 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::Impl -{ - Impl( ControlInterface& controlInterface ) - : mControlInterface( controlInterface ), - mLogicalModel(), - mVisualModel(), - mFontDefaults( NULL ), - mTextInput( NULL ), - mFontClient(), - mView(), - mLayoutEngine(), - mModifyEvents(), - mControlSize(), - mAlignmentOffset(), - mOperationsPending( NO_OPERATION ), - mRecalculateNaturalSize( true ) - { - mLogicalModel = LogicalModel::New(); - mVisualModel = VisualModel::New(); - - mFontClient = TextAbstraction::FontClient::Get(); - - mView.SetVisualModel( mVisualModel ); - - // Set the text properties to default - mVisualModel->SetTextColor( Color::WHITE ); - mVisualModel->SetShadowOffset( Vector2::ZERO ); - mVisualModel->SetShadowColor( Vector4::ZERO ); - mVisualModel->SetUnderlineEnabled( false ); - } - - ~Impl() - { - delete mTextInput; - } - - ControlInterface& mControlInterface; ///< Reference to the text controller. - LogicalModelPtr mLogicalModel; ///< Pointer to the logical model. - VisualModelPtr mVisualModel; ///< Pointer to the visual model. - FontDefaults* mFontDefaults; ///< Avoid allocating this when the user does not specify a font. - Controller::TextInput* mTextInput; ///< Avoid allocating everything for text input until EnableTextInput(). - TextAbstraction::FontClient mFontClient; ///< Handle to the font client. - View mView; ///< The view interface to the rendering back-end. - 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. -}; - ControllerPtr Controller::New( ControlInterface& controlInterface ) { return ControllerPtr( new Controller( controlInterface ) ); @@ -1023,14 +64,14 @@ void Controller::SetText( const std::string& text ) // Keep until size negotiation ModifyEvent event; - event.type = REPLACE_TEXT; + event.type = ModifyEvent::REPLACE_TEXT; event.text = text; mImpl->mModifyEvents.push_back( event ); - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { // Cancel previously queued events - mImpl->mTextInput->mEventQueue.clear(); + mImpl->mEventData->mEventQueue.clear(); // TODO - Hide selection decorations } @@ -1039,7 +80,7 @@ void Controller::SetText( const std::string& text ) void Controller::GetText( std::string& text ) const { if( !mImpl->mModifyEvents.empty() && - REPLACE_TEXT == mImpl->mModifyEvents[0].type ) + ModifyEvent::REPLACE_TEXT == mImpl->mModifyEvents[0].type ) { text = mImpl->mModifyEvents[0].text; } @@ -1051,17 +92,17 @@ void Controller::GetText( std::string& text ) const void Controller::SetPlaceholderText( const std::string& text ) { - if( !mImpl->mTextInput ) + if( !mImpl->mEventData ) { - mImpl->mTextInput->mPlaceholderText = text; + mImpl->mEventData->mPlaceholderText = text; } } void Controller::GetPlaceholderText( std::string& text ) const { - if( !mImpl->mTextInput ) + if( !mImpl->mEventData ) { - text = mImpl->mTextInput->mPlaceholderText; + text = mImpl->mEventData->mPlaceholderText; } } @@ -1069,7 +110,7 @@ void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily ) { if( !mImpl->mFontDefaults ) { - mImpl->mFontDefaults = new Controller::FontDefaults(); + mImpl->mFontDefaults = new FontDefaults(); } mImpl->mFontDefaults->mDefaultFontFamily = defaultFontFamily; @@ -1088,7 +129,7 @@ void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily ) mImpl->mVisualModel->mLines.Clear(); mImpl->mVisualModel->ClearCaches(); - RequestRelayout(); + mImpl->RequestRelayout(); } const std::string& Controller::GetDefaultFontFamily() const @@ -1105,7 +146,7 @@ void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle ) { if( !mImpl->mFontDefaults ) { - mImpl->mFontDefaults = new Controller::FontDefaults(); + mImpl->mFontDefaults = new FontDefaults(); } mImpl->mFontDefaults->mDefaultFontStyle = defaultFontStyle; @@ -1124,7 +165,7 @@ void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle ) mImpl->mVisualModel->mLines.Clear(); mImpl->mVisualModel->ClearCaches(); - RequestRelayout(); + mImpl->RequestRelayout(); } const std::string& Controller::GetDefaultFontStyle() const @@ -1141,7 +182,7 @@ void Controller::SetDefaultPointSize( float pointSize ) { if( !mImpl->mFontDefaults ) { - mImpl->mFontDefaults = new Controller::FontDefaults(); + mImpl->mFontDefaults = new FontDefaults(); } mImpl->mFontDefaults->mDefaultPointSize = pointSize; @@ -1160,7 +201,7 @@ void Controller::SetDefaultPointSize( float pointSize ) mImpl->mVisualModel->mLines.Clear(); mImpl->mVisualModel->ClearCaches(); - RequestRelayout(); + mImpl->RequestRelayout(); } float Controller::GetDefaultPointSize() const @@ -1187,89 +228,95 @@ void Controller::GetDefaultFonts( Vector& fonts, Length numberOfCharact } } +void Controller::SetTextColor( const Vector4& textColor ) +{ + mImpl->mVisualModel->SetTextColor( textColor ); +} + const Vector4& Controller::GetTextColor() const { return mImpl->mVisualModel->GetTextColor(); } +void Controller::SetShadowOffset( const Vector2& shadowOffset ) +{ + mImpl->mVisualModel->SetShadowOffset( shadowOffset ); +} + const Vector2& Controller::GetShadowOffset() const { return mImpl->mVisualModel->GetShadowOffset(); } -const Vector4& Controller::GetShadowColor() const +void Controller::SetShadowColor( const Vector4& shadowColor ) { - return mImpl->mVisualModel->GetShadowColor(); + mImpl->mVisualModel->SetShadowColor( shadowColor ); } -const Vector4& Controller::GetUnderlineColor() const +const Vector4& Controller::GetShadowColor() const { - return mImpl->mVisualModel->GetUnderlineColor(); + return mImpl->mVisualModel->GetShadowColor(); } -bool Controller::IsUnderlineEnabled() const +void Controller::SetUnderlineColor( const Vector4& color ) { - return mImpl->mVisualModel->IsUnderlineEnabled(); + mImpl->mVisualModel->SetUnderlineColor( color ); } -void Controller::SetTextColor( const Vector4& textColor ) +const Vector4& Controller::GetUnderlineColor() const { - mImpl->mVisualModel->SetTextColor( textColor ); + return mImpl->mVisualModel->GetUnderlineColor(); } -void Controller::SetShadowOffset( const Vector2& shadowOffset ) +void Controller::SetUnderlineEnabled( bool enabled ) { - mImpl->mVisualModel->SetShadowOffset( shadowOffset ); + mImpl->mVisualModel->SetUnderlineEnabled( enabled ); } -void Controller::SetShadowColor( const Vector4& shadowColor ) +bool Controller::IsUnderlineEnabled() const { - mImpl->mVisualModel->SetShadowColor( shadowColor ); + return mImpl->mVisualModel->IsUnderlineEnabled(); } -void Controller::SetUnderlineColor( const Vector4& color ) +void Controller::SetUnderlineHeight( float height ) { - mImpl->mVisualModel->SetUnderlineColor( color ); + mImpl->mVisualModel->SetUnderlineHeight( height ); } -void Controller::SetUnderlineEnabled( bool enabled ) +float Controller::GetUnderlineHeight() const { - mImpl->mVisualModel->SetUnderlineEnabled( enabled ); + return mImpl->mVisualModel->GetUnderlineHeight(); } void Controller::EnableTextInput( DecoratorPtr decorator ) { - if( !mImpl->mTextInput ) + if( !mImpl->mEventData ) { - mImpl->mTextInput = new TextInput( mImpl->mLogicalModel, - mImpl->mVisualModel, - decorator, - mImpl->mFontDefaults, - mImpl->mFontClient ); + mImpl->mEventData = new EventData( decorator ); } } void Controller::SetEnableCursorBlink( bool enable ) { - DALI_ASSERT_DEBUG( NULL != mImpl->mTextInput && "TextInput disabled" ); + DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "TextInput disabled" ); - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - mImpl->mTextInput->mCursorBlinkEnabled = enable; + mImpl->mEventData->mCursorBlinkEnabled = enable; if( !enable && - mImpl->mTextInput->mDecorator ) + mImpl->mEventData->mDecorator ) { - mImpl->mTextInput->mDecorator->StopCursorBlink(); + mImpl->mEventData->mDecorator->StopCursorBlink(); } } } bool Controller::GetEnableCursorBlink() const { - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - return mImpl->mTextInput->mCursorBlinkEnabled; + return mImpl->mEventData->mCursorBlinkEnabled; } return false; @@ -1277,9 +324,9 @@ bool Controller::GetEnableCursorBlink() const const Vector2& Controller::GetScrollPosition() const { - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - return mImpl->mTextInput->mScrollPosition; + return mImpl->mEventData->mScrollPosition; } return Vector2::ZERO; @@ -1395,7 +442,6 @@ bool Controller::Relayout( const Size& size ) mImpl->mVisualModel->SetGlyphPositions( NULL, 0u ); glyphsRemoved = true; } - // Not worth to relayout if width or height is equal to zero. return glyphsRemoved; } @@ -1427,10 +473,10 @@ bool Controller::Relayout( const Size& size ) // After doing the text layout, the alignment offset to place the actor in the desired position can be calculated. CalculateTextAlignment( size ); - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { // Move the cursor, grab handle etc. - updated = mImpl->mTextInput->ProcessInputEvents( mImpl->mControlSize, mImpl->mAlignmentOffset ) || updated; + updated = mImpl->ProcessInputEvents() || updated; } return updated; @@ -1442,18 +488,18 @@ void Controller::ProcessModifyEvents() for( unsigned int i=0; imTextInput ) + if( mImpl->mEventData ) { - mImpl->mTextInput->mPrimaryCursorPosition = characterCount; + mImpl->mEventData->mPrimaryCursorPosition = characterCount; // TODO - handle secondary cursor } @@ -1518,7 +564,7 @@ void Controller::ReplaceTextEvent( const std::string& text ) void Controller::InsertTextEvent( const std::string& text ) { - DALI_ASSERT_DEBUG( NULL != mImpl->mTextInput && "Unexpected InsertTextEvent" ); + DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected InsertTextEvent" ); // TODO - Optimize this mImpl->mLogicalModel->mScriptRuns.Clear(); @@ -1553,7 +599,7 @@ void Controller::InsertTextEvent( const std::string& text ) // Insert at current cursor position Vector& modifyText = mImpl->mLogicalModel->mText; - CharacterIndex& cursorIndex = mImpl->mTextInput->mPrimaryCursorPosition; + CharacterIndex& cursorIndex = mImpl->mEventData->mPrimaryCursorPosition; if( cursorIndex < modifyText.Count() ) { @@ -1579,12 +625,12 @@ void Controller::InsertTextEvent( const std::string& text ) REORDER ); // Queue a cursor reposition event; this must wait until after DoRelayout() - mImpl->mTextInput->mUpdateCursorPosition = true; + mImpl->mEventData->mUpdateCursorPosition = true; } void Controller::DeleteTextEvent() { - DALI_ASSERT_DEBUG( NULL != mImpl->mTextInput && "Unexpected InsertTextEvent" ); + DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected InsertTextEvent" ); // TODO - Optimize this mImpl->mLogicalModel->mScriptRuns.Clear(); @@ -1607,7 +653,7 @@ void Controller::DeleteTextEvent() // Delte at current cursor position Vector& modifyText = mImpl->mLogicalModel->mText; - CharacterIndex& cursorIndex = mImpl->mTextInput->mPrimaryCursorPosition; + CharacterIndex& cursorIndex = mImpl->mEventData->mPrimaryCursorPosition; if( cursorIndex > 0 && cursorIndex-1 < modifyText.Count() ) @@ -1630,7 +676,7 @@ void Controller::DeleteTextEvent() REORDER ); // Queue a cursor reposition event; this must wait until after DoRelayout() - mImpl->mTextInput->mUpdateCursorPosition = true; + mImpl->mEventData->mUpdateCursorPosition = true; } void Controller::UpdateModel( OperationsMask operationsRequired ) @@ -1804,6 +850,7 @@ bool Controller::DoRelayout( const Size& size, Vector& lineBreakInfo = mImpl->mLogicalModel->mLineBreakInfo; Vector& wordBreakInfo = mImpl->mLogicalModel->mWordBreakInfo; + Vector& characterDirection = mImpl->mLogicalModel->mCharacterDirections; Vector& glyphs = mImpl->mVisualModel->mGlyphs; Vector& glyphsToCharactersMap = mImpl->mVisualModel->mGlyphsToCharacters; Vector& charactersPerGlyph = mImpl->mVisualModel->mCharactersPerGlyph; @@ -1813,6 +860,7 @@ bool Controller::DoRelayout( const Size& size, mImpl->mLogicalModel->mText.Begin(), lineBreakInfo.Begin(), wordBreakInfo.Begin(), + ( 0u != characterDirection.Count() ) ? characterDirection.Begin() : NULL, numberOfGlyphs, glyphs.Begin(), glyphsToCharactersMap.Begin(), @@ -1979,52 +1027,47 @@ void Controller::CalculateTextAlignment( const Size& size ) } } -View& Controller::GetView() -{ - return mImpl->mView; -} - LayoutEngine& Controller::GetLayoutEngine() { return mImpl->mLayoutEngine; } -void Controller::RequestRelayout() +View& Controller::GetView() { - mImpl->mControlInterface.RequestTextRelayout(); + return mImpl->mView; } void Controller::KeyboardFocusGainEvent() { - DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected KeyboardFocusGainEvent" ); + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusGainEvent" ); - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - TextInput::Event event( TextInput::KEYBOARD_FOCUS_GAIN_EVENT ); - mImpl->mTextInput->mEventQueue.push_back( event ); + Event event( Event::KEYBOARD_FOCUS_GAIN_EVENT ); + mImpl->mEventData->mEventQueue.push_back( event ); - RequestRelayout(); + mImpl->RequestRelayout(); } } void Controller::KeyboardFocusLostEvent() { - DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected KeyboardFocusLostEvent" ); + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusLostEvent" ); - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - TextInput::Event event( TextInput::KEYBOARD_FOCUS_LOST_EVENT ); - mImpl->mTextInput->mEventQueue.push_back( event ); + Event event( Event::KEYBOARD_FOCUS_LOST_EVENT ); + mImpl->mEventData->mEventQueue.push_back( event ); - RequestRelayout(); + mImpl->RequestRelayout(); } } bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) { - DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected KeyEvent" ); + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyEvent" ); - if( mImpl->mTextInput && + if( mImpl->mEventData && keyEvent.state == KeyEvent::Down ) { int keyCode = keyEvent.keyCode; @@ -2041,29 +1084,29 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) Dali::DALI_KEY_CURSOR_UP == keyCode || Dali::DALI_KEY_CURSOR_DOWN == keyCode ) { - TextInput::Event event( TextInput::CURSOR_KEY_EVENT ); + Event event( Event::CURSOR_KEY_EVENT ); event.p1.mInt = keyCode; - mImpl->mTextInput->mEventQueue.push_back( event ); + mImpl->mEventData->mEventQueue.push_back( event ); } else if( Dali::DALI_KEY_BACKSPACE == keyCode ) { // Queue a delete event ModifyEvent event; - event.type = DELETE_TEXT; + event.type = ModifyEvent::DELETE_TEXT; mImpl->mModifyEvents.push_back( event ); } else if( !keyString.empty() ) { // Queue an insert event ModifyEvent event; - event.type = INSERT_TEXT; + event.type = ModifyEvent::INSERT_TEXT; event.text = keyString; mImpl->mModifyEvents.push_back( event ); } - mImpl->mTextInput->ChangeState( TextInput::EDITING ); // todo Confirm this is the best place to change the state of + mImpl->ChangeState( EventData::EDITING ); // todo Confirm this is the best place to change the state of - RequestRelayout(); + mImpl->RequestRelayout(); } return false; @@ -2071,49 +1114,50 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) void Controller::TapEvent( unsigned int tapCount, float x, float y ) { - DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected TapEvent" ); + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected TapEvent" ); - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - TextInput::Event event( TextInput::TAP_EVENT ); + Event event( Event::TAP_EVENT ); event.p1.mUint = tapCount; event.p2.mFloat = x; event.p3.mFloat = y; - mImpl->mTextInput->mEventQueue.push_back( event ); + mImpl->mEventData->mEventQueue.push_back( event ); - RequestRelayout(); + mImpl->RequestRelayout(); } } void Controller::PanEvent( Gesture::State state, const Vector2& displacement ) { - DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected PanEvent" ); + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected PanEvent" ); - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - TextInput::Event event( TextInput::PAN_EVENT ); + Event event( Event::PAN_EVENT ); event.p1.mInt = state; event.p2.mFloat = displacement.x; event.p3.mFloat = displacement.y; - mImpl->mTextInput->mEventQueue.push_back( event ); + mImpl->mEventData->mEventQueue.push_back( event ); - RequestRelayout(); + mImpl->RequestRelayout(); } } void Controller::GrabHandleEvent( GrabHandleState state, float x, float y ) { - DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected GrabHandleEvent" ); + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected GrabHandleEvent" ); - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - TextInput::Event event( TextInput::GRAB_HANDLE_EVENT ); + Event event( Event::GRAB_HANDLE_EVENT ); event.p1.mUint = state; event.p2.mFloat = x; event.p3.mFloat = y; - mImpl->mTextInput->mEventQueue.push_back( event ); + + mImpl->mEventData->mEventQueue.push_back( event ); - RequestRelayout(); + mImpl->RequestRelayout(); } }