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=151539c5adc72072c2d56c424b7d5a253c1130d7;hp=74ab9ae38bc9a5d728adfc6b8720ee9f41446ac0;hb=206696d4fd84da01100fe43a9360af48c4f6101e;hpb=0207e16930421216c5a22a0fd3ac409f3bd2a7b0 diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 74ab9ae..151539c 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -79,6 +79,7 @@ struct Controller::TextInput KEYBOARD_FOCUS_LOST_EVENT, CURSOR_KEY_EVENT, TAP_EVENT, + PAN_EVENT, GRAB_HANDLE_EVENT }; @@ -108,7 +109,8 @@ struct Controller::TextInput { INACTIVE, SELECTING, - EDITING + EDITING, + EDITING_WITH_POPUP }; TextInput( LogicalModelPtr logicalModel, @@ -121,14 +123,21 @@ struct Controller::TextInput mPrimaryCursorPosition( 0u ), mSecondaryCursorPosition( 0u ), mDecoratorUpdated( false ), - mCursorBlinkEnabled( true ) + mCursorBlinkEnabled( true ), + mGrabHandleEnabled( true ), + mGrabHandlePopupEnabled( true ), + mSelectionEnabled( false ), + mHorizontalScrollingEnabled( true ), + mVerticalScrollingEnabled( false ), + mUpdateCursorPosition( false ) { } /** * @brief Helper to move the cursor, grab handle etc. */ - bool ProcessInputEvents() + bool ProcessInputEvents( const Vector2& controlSize, + const Vector2& alignmentOffset ) { mDecoratorUpdated = false; @@ -155,7 +164,12 @@ struct Controller::TextInput } case TAP_EVENT: { - OnTapEvent( *iter ); + OnTapEvent( *iter, alignmentOffset ); + break; + } + case PAN_EVENT: + { + OnPanEvent( *iter, controlSize, alignmentOffset ); break; } case GRAB_HANDLE_EVENT: @@ -167,6 +181,13 @@ struct Controller::TextInput } } + // The cursor must also be repositioned after inserts into the model + if( mUpdateCursorPosition ) + { + UpdateCursorPosition(); + mUpdateCursorPosition = false; + } + mEventQueue.clear(); return mDecoratorUpdated; @@ -206,22 +227,13 @@ struct Controller::TextInput } } - void HandleBackspaceKey() - { - // TODO - } - void HandleCursorKey( int keyCode ) { // TODO } - void HandleKeyString( const char* keyString ) - { - // TODO - } - - void OnTapEvent( const Event& event ) + void OnTapEvent( const Event& event, + const Vector2& alignmentOffset ) { unsigned int tapCount = event.p1.mUint; @@ -229,20 +241,76 @@ 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( 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, + 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; @@ -253,17 +321,20 @@ 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(); + //mDecorator->HidePopup(); + ChangeState ( EDITING ); mDecoratorUpdated = true; } - else if ( GRAB_HANDLE_RELEASED == state ) + else if ( mGrabHandlePopupEnabled && + GRAB_HANDLE_RELEASED == state ) { - mDecorator->ShowPopup(); + //mDecorator->ShowPopup(); + ChangeState ( EDITING_WITH_POPUP ); + mDecoratorUpdated = true; } - } void ChangeState( State newState ) @@ -278,7 +349,7 @@ struct Controller::TextInput mDecorator->StopCursorBlink(); mDecorator->SetGrabHandleActive( false ); mDecorator->SetSelectionActive( false ); - mDecorator->HidePopup(); + mDecorator->SetPopupActive( false ); mDecoratorUpdated = true; } else if ( SELECTING == mState ) @@ -296,55 +367,174 @@ struct Controller::TextInput { mDecorator->StartCursorBlink(); } - mDecorator->SetGrabHandleActive( true ); + 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; } } } - void GetClosestCursorPosition( float& x, float& y, float& height ) + LineIndex GetClosestLine( float y ) { - // TODO - Look at LineRuns first + LineIndex lineIndex( 0u ); - Text::Length numberOfGlyphs = mVisualModel->GetNumberOfGlyphs(); - if( 0 == numberOfGlyphs ) + const Vector& lines = mVisualModel->mLines; + for( float totalHeight = 0; lineIndex < lines.Count(); ++lineIndex ) + { + totalHeight += lines[lineIndex].lineSize.height; + if( y < totalHeight ) + { + return lineIndex; + } + } + + return lineIndex-1; + } + + 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 = mVisualModel->mGlyphs; + // 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 = mVisualModel->mGlyphPositions; + 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 ); + } + } + + // Calculate the logical position + logical = mVisualModel->GetCharacterIndex( closestGlyph ); + + // 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 - // TODO - Consider RTL languages - x = positions[closestGlyph].x + glyphs[closestGlyph].width; - y = 0.0f; + float visualX( 0.0f ); + float visualY( 0.0f ); + float height( 0.0f ); + const Vector& lineRuns = mVisualModel->mLines; - FontMetrics metrics; - TextAbstraction::FontClient::Get().GetFontMetrics( glyphs[closestGlyph].fontId, metrics ); - height = metrics.height; // TODO - Fix for multi-line + if( cursorGlyph > 0 ) + { + --cursorGlyph; + + visualX = mVisualModel->mGlyphPositions[ cursorGlyph ].x; + //if( LTR ) TODO + visualX += mVisualModel->mGlyphs[ cursorGlyph ].width; + + // Find the line height + 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, height ); + mDecoratorUpdated = true; } LogicalModelPtr mLogicalModel; @@ -364,8 +554,20 @@ struct Controller::TextInput CharacterIndex mPrimaryCursorPosition; ///< Index into logical model for primary cursor CharacterIndex mSecondaryCursorPosition; ///< Index into logical model for secondary cursor - bool mDecoratorUpdated : 1; ///< True if the decorator was updated during event processing - bool mCursorBlinkEnabled : 1; ///< True if cursor should blink when active + /** + * 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 @@ -406,6 +608,7 @@ struct Controller::Impl mLayoutEngine(), mModifyEvents(), mControlSize(), + mAlignmentOffset(), mOperationsPending( NO_OPERATION ), mRecalculateNaturalSize( true ) { @@ -432,6 +635,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. }; @@ -501,6 +705,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 @@ -524,6 +740,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 @@ -547,6 +775,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 @@ -607,6 +847,21 @@ bool Controller::GetEnableCursorBlink() const return false; } +const Vector2& Controller::GetScrollPosition() const +{ + if( mImpl->mTextInput ) + { + return mImpl->mTextInput->mScrollPosition; + } + + return Vector2::ZERO; +} + +const Vector2& Controller::GetAlignmentOffset() const +{ + return mImpl->mAlignmentOffset; +} + Vector3 Controller::GetNaturalSize() { Vector3 naturalSize; @@ -702,7 +957,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 ) ) { @@ -741,10 +996,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() || updated; + updated = mImpl->mTextInput->ProcessInputEvents( mImpl->mControlSize, mImpl->mAlignmentOffset ) || updated; } return updated; @@ -786,6 +1044,7 @@ void Controller::ReplaceTextEvent( const std::string& text ) mImpl->mLogicalModel->mLineBreakInfo.Clear(); mImpl->mLogicalModel->mWordBreakInfo.Clear(); mImpl->mLogicalModel->mBidirectionalParagraphInfo.Clear(); + mImpl->mLogicalModel->mCharacterDirections.Clear(); mImpl->mLogicalModel->mBidirectionalLineInfo.Clear(); mImpl->mLogicalModel->mLogicalToVisualMap.Clear(); mImpl->mLogicalModel->mVisualToLogicalMap.Clear(); @@ -838,7 +1097,17 @@ void Controller::InsertTextEvent( const std::string& text ) mImpl->mLogicalModel->mLineBreakInfo.Clear(); mImpl->mLogicalModel->mWordBreakInfo.Clear(); mImpl->mLogicalModel->mBidirectionalParagraphInfo.Clear(); + mImpl->mLogicalModel->mCharacterDirections.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; @@ -878,6 +1147,9 @@ void Controller::InsertTextEvent( const std::string& text ) ALIGN | UPDATE_ACTUAL_SIZE | REORDER ); + + // Queue a cursor reposition event; this must wait until after DoRelayout() + mImpl->mTextInput->mUpdateCursorPosition = true; } void Controller::DeleteTextEvent() @@ -890,7 +1162,17 @@ void Controller::DeleteTextEvent() mImpl->mLogicalModel->mLineBreakInfo.Clear(); mImpl->mLogicalModel->mWordBreakInfo.Clear(); mImpl->mLogicalModel->mBidirectionalParagraphInfo.Clear(); + mImpl->mLogicalModel->mCharacterDirections.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; @@ -915,6 +1197,9 @@ void Controller::DeleteTextEvent() 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 ) @@ -1019,8 +1304,21 @@ void Controller::UpdateModel( OperationsMask operationsRequired ) // TODO: consider if the mirrored string can be stored as well. textMirrored = GetMirroredText( utf32Characters, mirroredUtf32Characters ); + + // Only set the character directions if there is right to left characters. + Vector& directions = mImpl->mLogicalModel->mCharacterDirections; + directions.Resize( numberOfCharacters ); + + GetCharactersDirection( bidirectionalInfo, + directions ); + } + else + { + // There is no right to left characters. Clear the directions vector. + mImpl->mLogicalModel->mCharacterDirections.Clear(); } - } + + } Vector& glyphs = mImpl->mVisualModel->mGlyphs; Vector& glyphsToCharactersMap = mImpl->mVisualModel->mGlyphsToCharacters; @@ -1053,7 +1351,7 @@ void Controller::UpdateModel( OperationsMask operationsRequired ) } } -bool Controller::DoRelayout( const Vector2& size, +bool Controller::DoRelayout( const Size& size, OperationsMask operationsRequired, Size& layoutSize ) { @@ -1163,6 +1461,7 @@ bool Controller::DoRelayout( const Vector2& size, if( ALIGN & operations ) { mImpl->mLayoutEngine.Align( layoutParameters, + layoutSize, lines, glyphPositions ); } @@ -1182,6 +1481,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; @@ -1264,6 +1610,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(); } @@ -1286,6 +1634,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" );