X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller.cpp;h=d599bdd0a7ea3dcfff5344af70f6dcf355cb13cf;hb=ebb05c83defab9c07a991ea2f102085ecea3709d;hp=34f73b04821e0a93a7fccfba705d0ef87150ae92;hpb=21eabe4bf9ae87c14bf28c18c68d58393eac5a92;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 34f73b0..d599bdd 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -20,44 +20,26 @@ // 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(); -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; -}; +const std::string EMPTY_STRING(""); } // namespace @@ -70,617 +52,6 @@ namespace Toolkit namespace Text { -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; - }; - - enum State - { - INACTIVE, - SELECTING, - EDITING, - EDITING_WITH_POPUP - }; - - TextInput( LogicalModelPtr logicalModel, - VisualModelPtr visualModel, - DecoratorPtr decorator ) - : mLogicalModel( logicalModel ), - mVisualModel( visualModel ), - mDecorator( decorator ), - 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 ) - { - // TODO - } - else if( Dali::DALI_KEY_CURSOR_RIGHT == keyCode ) - { - // TODO - } - else if( Dali::DALI_KEY_CURSOR_UP == keyCode ) - { - // TODO - } - else if( Dali::DALI_KEY_CURSOR_DOWN == keyCode ) - { - // TODO - } - } - - 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; - float height(0.0f); - GetClosestCursorPosition( mPrimaryCursorPosition, xPosition, yPosition, height ); - mDecorator->SetPosition( PRIMARY_CURSOR, xPosition, yPosition, height, height ); // TODO: To be fixed in the next patch. - mUpdateCursorPosition = false; - - mDecoratorUpdated = true; - } - 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; - float yPosition = event.p3.mFloat; - float height(0.0f); - - GetClosestCursorPosition( mPrimaryCursorPosition, xPosition, yPosition, height ); - - mDecorator->SetPosition( PRIMARY_CURSOR, xPosition, yPosition, height, height ); // TODO: To be fixed in the next patch. - - //mDecorator->HidePopup(); - ChangeState ( EDITING ); - mDecoratorUpdated = true; - } - 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 ) - { - LineIndex lineIndex( 0u ); - - const Vector& lines = mVisualModel->mLines; - for( float totalHeight = 0; lineIndex < lines.Count(); ++lineIndex ) - { - const LineRun& lineRun = lines[lineIndex]; - totalHeight += lineRun.ascender + -lineRun.descender; - 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; - } - - // 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(); - - 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; - - 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 - 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.ascender + -line.descender; - } - - 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 ); - float height( 0.0f ); - 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 - GlyphIndex lastGlyph( 0 ); - for( LineIndex lineIndex = 0u; lineIndex < lineRuns.Count(); ++lineIndex ) - { - lastGlyph = (lineRuns[lineIndex].glyphIndex + lineRuns[lineIndex].numberOfGlyphs); - if( cursorGlyph < lastGlyph ) - { - const LineRun& lineRun = lineRuns[lineIndex]; - height = lineRun.ascender + -lineRun.descender; - break; - } - } - } - - mDecorator->SetPosition( PRIMARY_CURSOR, visualX, visualY, height, height ); // TODO: To be fixed in the next patch. - mDecoratorUpdated = true; - } - - LogicalModelPtr mLogicalModel; - VisualModelPtr mVisualModel; - DecoratorPtr mDecorator; - - 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::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::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 ) ); @@ -693,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 } @@ -709,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; } @@ -721,25 +92,38 @@ 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; } } +void Controller::SetMaximumNumberOfCharacters( int maxCharacters ) +{ + if ( maxCharacters >= 0 ) + { + mImpl->mMaximumNumberOfCharacters = maxCharacters; + } +} + +int Controller::GetMaximumNumberOfCharacters() +{ + return mImpl->mMaximumNumberOfCharacters; +} + void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily ) { if( !mImpl->mFontDefaults ) { - mImpl->mFontDefaults = new Controller::FontDefaults(); + mImpl->mFontDefaults = new FontDefaults(); } mImpl->mFontDefaults->mDefaultFontFamily = defaultFontFamily; @@ -756,8 +140,9 @@ void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily ) mImpl->mVisualModel->mGlyphsPerCharacter.Clear(); mImpl->mVisualModel->mGlyphPositions.Clear(); mImpl->mVisualModel->mLines.Clear(); + mImpl->mVisualModel->ClearCaches(); - RequestRelayout(); + mImpl->RequestRelayout(); } const std::string& Controller::GetDefaultFontFamily() const @@ -774,7 +159,7 @@ void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle ) { if( !mImpl->mFontDefaults ) { - mImpl->mFontDefaults = new Controller::FontDefaults(); + mImpl->mFontDefaults = new FontDefaults(); } mImpl->mFontDefaults->mDefaultFontStyle = defaultFontStyle; @@ -791,8 +176,9 @@ void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle ) mImpl->mVisualModel->mGlyphsPerCharacter.Clear(); mImpl->mVisualModel->mGlyphPositions.Clear(); mImpl->mVisualModel->mLines.Clear(); + mImpl->mVisualModel->ClearCaches(); - RequestRelayout(); + mImpl->RequestRelayout(); } const std::string& Controller::GetDefaultFontStyle() const @@ -809,7 +195,7 @@ void Controller::SetDefaultPointSize( float pointSize ) { if( !mImpl->mFontDefaults ) { - mImpl->mFontDefaults = new Controller::FontDefaults(); + mImpl->mFontDefaults = new FontDefaults(); } mImpl->mFontDefaults->mDefaultPointSize = pointSize; @@ -826,8 +212,9 @@ void Controller::SetDefaultPointSize( float pointSize ) mImpl->mVisualModel->mGlyphsPerCharacter.Clear(); mImpl->mVisualModel->mGlyphPositions.Clear(); mImpl->mVisualModel->mLines.Clear(); + mImpl->mVisualModel->ClearCaches(); - RequestRelayout(); + mImpl->RequestRelayout(); } float Controller::GetDefaultPointSize() const @@ -840,7 +227,7 @@ float Controller::GetDefaultPointSize() const return 0.0f; } -void Controller::GetDefaultFonts( Vector& fonts, Length numberOfCharacters ) +void Controller::GetDefaultFonts( Vector& fonts, Length numberOfCharacters ) const { if( mImpl->mFontDefaults ) { @@ -854,85 +241,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->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; @@ -940,9 +337,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; @@ -1058,7 +455,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; } @@ -1090,10 +486,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; @@ -1105,18 +501,18 @@ void Controller::ProcessModifyEvents() for( unsigned int i=0; imVisualModel->mGlyphsPerCharacter.Clear(); mImpl->mVisualModel->mGlyphPositions.Clear(); mImpl->mVisualModel->mLines.Clear(); + mImpl->mVisualModel->ClearCaches(); // Convert text into UTF-32 Vector& utf32Characters = mImpl->mLogicalModel->mText; @@ -1160,9 +557,9 @@ void Controller::ReplaceTextEvent( const std::string& text ) utf32Characters.Resize( characterCount ); // Reset the cursor position - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - mImpl->mTextInput->mPrimaryCursorPosition = characterCount; + mImpl->mEventData->mPrimaryCursorPosition = characterCount; // TODO - handle secondary cursor } @@ -1180,7 +577,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(); @@ -1199,6 +596,7 @@ void Controller::InsertTextEvent( const std::string& text ) mImpl->mVisualModel->mGlyphsPerCharacter.Clear(); mImpl->mVisualModel->mGlyphPositions.Clear(); mImpl->mVisualModel->mLines.Clear(); + mImpl->mVisualModel->ClearCaches(); // Convert text into UTF-32 Vector utf32Characters; @@ -1212,21 +610,26 @@ void Controller::InsertTextEvent( const std::string& text ) Length characterCount = Utf8ToUtf32( utf8, text.size(), utf32Characters.Begin() ); utf32Characters.Resize( characterCount ); + const Length numberOfCharactersInModel = mImpl->mLogicalModel->GetNumberOfCharacters(); + + // Restrict new text to fit within Maximum characters setting + Length maxSizeOfNewText = std::min ( ( mImpl->mMaximumNumberOfCharacters - numberOfCharactersInModel ), characterCount ); + // Insert at current cursor position + CharacterIndex& cursorIndex = mImpl->mEventData->mPrimaryCursorPosition; + Vector& modifyText = mImpl->mLogicalModel->mText; - CharacterIndex& cursorIndex = mImpl->mTextInput->mPrimaryCursorPosition; - if( cursorIndex < modifyText.Count() ) + if( cursorIndex < numberOfCharactersInModel ) { - modifyText.Insert( modifyText.Begin() + cursorIndex, utf32Characters.Begin(), utf32Characters.End() ); + modifyText.Insert( modifyText.Begin() + cursorIndex, utf32Characters.Begin(), utf32Characters.Begin()+ maxSizeOfNewText ); } else { - modifyText.Insert( modifyText.End(), utf32Characters.Begin(), utf32Characters.End() ); + modifyText.Insert( modifyText.End(), utf32Characters.Begin(), utf32Characters.Begin() + maxSizeOfNewText ); } - // Advance the cursor position - ++cursorIndex; + cursorIndex += maxSizeOfNewText; // The natural size needs to be re-calculated. mImpl->mRecalculateNaturalSize = true; @@ -1240,12 +643,18 @@ 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; + mImpl->mEventData->mScrollAfterUpdateCursorPosition = true; + + if ( characterCount > maxSizeOfNewText ) + { + mImpl->mControlInterface.MaxLengthReached(); + } } 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(); @@ -1264,10 +673,11 @@ void Controller::DeleteTextEvent() mImpl->mVisualModel->mGlyphsPerCharacter.Clear(); mImpl->mVisualModel->mGlyphPositions.Clear(); mImpl->mVisualModel->mLines.Clear(); + mImpl->mVisualModel->ClearCaches(); // 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() ) @@ -1290,7 +700,8 @@ void Controller::DeleteTextEvent() REORDER ); // Queue a cursor reposition event; this must wait until after DoRelayout() - mImpl->mTextInput->mUpdateCursorPosition = true; + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterUpdateCursorPosition = true; } void Controller::UpdateModel( OperationsMask operationsRequired ) @@ -1456,8 +867,15 @@ bool Controller::DoRelayout( const Size& size, Length numberOfGlyphs = mImpl->mVisualModel->GetNumberOfGlyphs(); + if( 0u == numberOfGlyphs ) + { + // Nothing else to do if there is no glyphs. + return true; + } + 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; @@ -1467,6 +885,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(), @@ -1633,52 +1052,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; @@ -1695,29 +1109,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; @@ -1725,49 +1139,81 @@ 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 ) +void Controller::HandleEvent( HandleType handleType, HandleState state, float x, float y ) { - DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected GrabHandleEvent" ); + DALI_ASSERT_DEBUG( mImpl->mEventData && "Controller::HandleEvent. Unexpected HandleEvent" ); - if( mImpl->mTextInput ) + if( mImpl->mEventData ) { - TextInput::Event event( TextInput::GRAB_HANDLE_EVENT ); - event.p1.mUint = state; - event.p2.mFloat = x; - event.p3.mFloat = y; - mImpl->mTextInput->mEventQueue.push_back( event ); + switch( handleType ) + { + case GRAB_HANDLE: + { + Event event( Event::GRAB_HANDLE_EVENT ); + event.p1.mUint = state; + event.p2.mFloat = x; + event.p3.mFloat = y; + + mImpl->mEventData->mEventQueue.push_back( event ); + break; + } + case LEFT_SELECTION_HANDLE: + { + Event event( Event::LEFT_SELECTION_HANDLE_EVENT ); + event.p1.mUint = state; + event.p2.mFloat = x; + event.p3.mFloat = y; + + mImpl->mEventData->mEventQueue.push_back( event ); + break; + } + case RIGHT_SELECTION_HANDLE: + { + Event event( Event::RIGHT_SELECTION_HANDLE_EVENT ); + event.p1.mUint = state; + event.p2.mFloat = x; + event.p3.mFloat = y; + + mImpl->mEventData->mEventQueue.push_back( event ); + break; + } + case HANDLE_TYPE_COUNT: + { + DALI_ASSERT_DEBUG( !"Controller::HandleEvent. Unexpected handle type" ); + } + } - RequestRelayout(); + mImpl->RequestRelayout(); } }