X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fdecorator%2Ftext-decorator.cpp;h=6ae1821eec6bc3e1f8821dbcde604ea1cf2249a7;hp=3a6d7dad5d36929478e6be9325b6153028611785;hb=48ce7053cae43576126273091e0a865e5a87aea6;hpb=8e4860da0bed4e33e1d248ce40d5e5e5f8d28347 diff --git a/dali-toolkit/internal/text/decorator/text-decorator.cpp b/dali-toolkit/internal/text/decorator/text-decorator.cpp index 3a6d7da..6ae1821 100644 --- a/dali-toolkit/internal/text/decorator/text-decorator.cpp +++ b/dali-toolkit/internal/text/decorator/text-decorator.cpp @@ -54,7 +54,6 @@ #endif - namespace Dali { namespace Internal @@ -82,8 +81,9 @@ const char* DEFAULT_SELECTION_HANDLE_TWO( DALI_IMAGE_DIR "text-input-selection-h const Dali::Vector3 DEFAULT_GRAB_HANDLE_RELATIVE_SIZE( 1.5f, 2.0f, 1.0f ); const Dali::Vector3 DEFAULT_SELECTION_HANDLE_RELATIVE_SIZE( 1.5f, 1.5f, 1.0f ); -const std::size_t CURSOR_BLINK_INTERVAL = 500; // Cursor blink interval -const std::size_t MILLISECONDS = 1000; +const unsigned int CURSOR_BLINK_INTERVAL = 500u; // Cursor blink interval +const float TO_MILLISECONDS = 1000.f; +const float TO_SECONDS = 1.f / 1000.f; const float DISPLAYED_HIGHLIGHT_Z_OFFSET( -0.05f ); @@ -154,66 +154,61 @@ struct Decorator::Impl : public ConnectionTracker struct CursorImpl { CursorImpl() - : x(0.0f), - y(0.0f), - cursorHeight(0.0f), - lineHeight(0.0f), - color(Dali::Color::WHITE) + : color( Dali::Color::WHITE ), + position(), + cursorHeight( 0.0f ), + lineHeight( 0.0f ) { } - float x; - float y; + Vector4 color; + Vector2 position; float cursorHeight; float lineHeight; - - Vector4 color; }; struct SelectionHandleImpl { SelectionHandleImpl() - : x(0.0f), - y(0.0f), - lineHeight(0.0f), - flipped(false) + : position(), + lineHeight( 0.0f ), + flipped( false ) { } - float x; - float y; - float lineHeight; ///< Not the handle height - bool flipped; - ImageActor actor; Actor grabArea; Image pressedImage; Image releasedImage; + + Vector2 position; + float lineHeight; ///< Not the handle height + bool flipped; }; Impl( Dali::Toolkit::Internal::Control& parent, Observer& observer ) - : mTextControlParent(parent), - mObserver(observer), - mActiveCursor(ACTIVE_CURSOR_NONE), - mActiveGrabHandle(false), - mActiveSelection( false ), - mActiveCopyPastePopup( false ), + : mTextControlParent( parent ), + mObserver( observer ), + mBoundingBox( Rect() ), + mHighlightColor( 0.07f, 0.41f, 0.59f, 1.0f ), // light blue + mActiveCursor( ACTIVE_CURSOR_NONE ), mCursorBlinkInterval( CURSOR_BLINK_INTERVAL ), mCursorBlinkDuration( 0.0f ), - mCursorBlinkStatus( true ), mGrabDisplacementX( 0.0f ), mGrabDisplacementY( 0.0f ), - mHighlightColor( 0.07f, 0.41f, 0.59f, 1.0f ), // light blue - mBoundingBox( Rect() ) + mActiveGrabHandle( false ), + mActiveSelection( false ), + mActiveCopyPastePopup( false ), + mCursorBlinkStatus( true ) { } /** * Relayout of the decorations owned by the decorator. - * @param[in] size The Size of the UI control the decorater is adding it's decorations to. + * @param[in] size The Size of the UI control the decorator is adding it's decorations to. */ - void Relayout( const Vector2& size, const Vector2& scrollPosition ) + void Relayout( const Vector2& size ) { // TODO - Remove this if nothing is active CreateActiveLayer(); @@ -222,14 +217,14 @@ struct Decorator::Impl : public ConnectionTracker CreateCursors(); if( mPrimaryCursor ) { - mPrimaryCursor.SetPosition( mCursor[PRIMARY_CURSOR].x + scrollPosition.x, - mCursor[PRIMARY_CURSOR].y + scrollPosition.y ); + mPrimaryCursor.SetPosition( mCursor[PRIMARY_CURSOR].position.x, + mCursor[PRIMARY_CURSOR].position.y ); mPrimaryCursor.SetSize( Size( 1.0f, mCursor[PRIMARY_CURSOR].cursorHeight ) ); } if( mSecondaryCursor ) { - mSecondaryCursor.SetPosition( mCursor[SECONDARY_CURSOR].x + scrollPosition.x, - mCursor[SECONDARY_CURSOR].y + scrollPosition.y ); + mSecondaryCursor.SetPosition( mCursor[SECONDARY_CURSOR].position.x, + mCursor[SECONDARY_CURSOR].position.y ); mSecondaryCursor.SetSize( Size( 1.0f, mCursor[SECONDARY_CURSOR].cursorHeight ) ); } @@ -240,8 +235,8 @@ struct Decorator::Impl : public ConnectionTracker CreateGrabHandle(); - mGrabHandle.SetPosition( mCursor[PRIMARY_CURSOR].x + scrollPosition.x, - mCursor[PRIMARY_CURSOR].lineHeight + scrollPosition.y ); + mGrabHandle.SetPosition( mCursor[PRIMARY_CURSOR].position.x, + mCursor[PRIMARY_CURSOR].position.y + mCursor[PRIMARY_CURSOR].lineHeight ); } else if( mGrabHandle ) { @@ -256,12 +251,12 @@ struct Decorator::Impl : public ConnectionTracker CreateSelectionHandles(); SelectionHandleImpl& primary = mSelectionHandle[ PRIMARY_SELECTION_HANDLE ]; - primary.actor.SetPosition( primary.x + scrollPosition.x, - primary.lineHeight + scrollPosition.y ); + primary.actor.SetPosition( primary.position.x, + primary.position.y + primary.lineHeight ); SelectionHandleImpl& secondary = mSelectionHandle[ SECONDARY_SELECTION_HANDLE ]; - secondary.actor.SetPosition( secondary.x + scrollPosition.x, - secondary.lineHeight + scrollPosition.y ); + secondary.actor.SetPosition( secondary.position.x, + secondary.position.y + secondary.lineHeight ); CreateHighlight(); UpdateHighlight(); @@ -295,13 +290,23 @@ struct Decorator::Impl : public ConnectionTracker } } + void UpdatePositions( const Vector2& scrollOffset ) + { + mCursor[PRIMARY_CURSOR].position += scrollOffset; + mCursor[SECONDARY_CURSOR].position += scrollOffset; + mSelectionHandle[ PRIMARY_SELECTION_HANDLE ].position += scrollOffset; + mSelectionHandle[ SECONDARY_SELECTION_HANDLE ].position += scrollOffset; + + // TODO Highlight box?? + } + void PopUpRelayoutComplete( Actor actor ) { // Size negotiation for CopyPastePopup complete so can get the size and constrain position within bounding box. mCopyPastePopup.OnRelayoutSignal().Disconnect( this, &Decorator::Impl::PopUpRelayoutComplete ); - Vector3 popupPosition( mCursor[PRIMARY_CURSOR].x, mCursor[PRIMARY_CURSOR].y -100.0f , 0.0f); //todo 100 to be an offset Property + Vector3 popupPosition( mCursor[PRIMARY_CURSOR].position.x, mCursor[PRIMARY_CURSOR].position.y -100.0f , 0.0f); //todo 100 to be an offset Property Vector3 popupSize = Vector3( mCopyPastePopup.GetRelayoutSize( Dimension::WIDTH ), mCopyPastePopup.GetRelayoutSize( Dimension::HEIGHT ), 0.0f ); @@ -317,7 +322,6 @@ struct Decorator::Impl : public ConnectionTracker cursor = CreateSolidColorActor( Color::WHITE ); cursor.SetParentOrigin( ParentOrigin::TOP_LEFT ); // Need to set the default parent origin as CreateSolidColorActor() sets a different one. cursor.SetAnchorPoint( AnchorPoint::TOP_CENTER ); - cursor.SetRelayoutEnabled( false ); } // Add or Remove cursor(s) from parent @@ -340,7 +344,7 @@ struct Decorator::Impl : public ConnectionTracker #ifdef DECORATOR_DEBUG mPrimaryCursor.SetName( "PrimaryCursorActor" ); #endif - mActiveLayer.Add( mPrimaryCursor); + mActiveLayer.Add( mPrimaryCursor ); } } @@ -352,7 +356,7 @@ struct Decorator::Impl : public ConnectionTracker #ifdef DECORATOR_DEBUG mSecondaryCursor.SetName( "SecondaryCursorActor" ); #endif - mActiveLayer.Add( mSecondaryCursor); + mActiveLayer.Add( mSecondaryCursor ); } } else @@ -438,12 +442,10 @@ struct Decorator::Impl : public ConnectionTracker else { mGrabArea = Actor::New(); - mGrabArea.SetRelayoutEnabled( true ); mGrabArea.SetName( "GrabArea" ); } #else mGrabArea = Actor::New(); - mGrabArea.SetRelayoutEnabled( true ); #endif mGrabArea.SetParentOrigin( ParentOrigin::TOP_CENTER ); @@ -478,7 +480,6 @@ struct Decorator::Impl : public ConnectionTracker primary.flipped = false; primary.grabArea = Actor::New(); // Area that Grab handle responds to, larger than actual handle so easier to move - primary.grabArea.SetRelayoutEnabled( true ); #ifdef DECORATOR_DEBUG primary.grabArea.SetName("SelectionHandleOneGrabArea"); #endif @@ -511,7 +512,6 @@ struct Decorator::Impl : public ConnectionTracker secondary.flipped = false; secondary.grabArea = Actor::New(); // Area that Grab handle responds to, larger than actual handle so easier to move - secondary.grabArea.SetRelayoutEnabled( true ); #ifdef DECORATOR_DEBUG secondary.grabArea.SetName("SelectionHandleTwoGrabArea"); #endif @@ -666,8 +666,8 @@ struct Decorator::Impl : public ConnectionTracker mGrabDisplacementX += gesture.displacement.x; mGrabDisplacementY += gesture.displacement.y; - float x = mCursor[PRIMARY_CURSOR].x + mGrabDisplacementX; - float y = mCursor[PRIMARY_CURSOR].y + mCursor[PRIMARY_CURSOR].lineHeight*0.5f + mGrabDisplacementY; + const float x = mCursor[PRIMARY_CURSOR].position.x + mGrabDisplacementX; + const float y = mCursor[PRIMARY_CURSOR].position.y + mCursor[PRIMARY_CURSOR].lineHeight*0.5f + mGrabDisplacementY; if( Gesture::Started == gesture.state || Gesture::Continuing == gesture.state ) @@ -703,12 +703,12 @@ struct Decorator::Impl : public ConnectionTracker if ( mPrimaryCursor ) // Secondary cursor not used for paste { Cursor cursor = PRIMARY_CURSOR; - alternativePosition = mCursor[cursor].y; + alternativePosition = mCursor[cursor].position.y; } const float popupHeight = 120.0f; // todo Set as a MaxSize Property in Control or retrieve from CopyPastePopup class. - if ( mActiveGrabHandle ) + if( mActiveGrabHandle ) { // If grab handle enabled then position pop-up below the grab handle. const Vector2 grabHandleSize( 59.0f, 56.0f ); // todo @@ -792,49 +792,44 @@ struct Decorator::Impl : public ConnectionTracker requiredPopupPosition.x = requiredPopupPosition.x + xOffSetToKeepWithinBounds; } - Internal::Control& mTextControlParent; - Observer& mObserver; - - Layer mActiveLayer; // Layer for active handles and alike that ensures they are above all else. + Internal::Control& mTextControlParent; + Observer& mObserver; - unsigned int mActiveCursor; - bool mActiveGrabHandle; - bool mActiveSelection; - bool mActiveCopyPastePopup; + TapGestureDetector mTapDetector; + PanGestureDetector mPanGestureDetector; + Timer mCursorBlinkTimer; ///< Timer to signal cursor to blink - CursorImpl mCursor[CURSOR_COUNT]; + Layer mActiveLayer; ///< Layer for active handles and alike that ensures they are above all else. + ImageActor mPrimaryCursor; + ImageActor mSecondaryCursor; + ImageActor mGrabHandle; + Actor mGrabArea; + MeshActor mHighlightMeshActor; ///< Mesh Actor to display highlight + TextSelectionPopup mCopyPastePopup; - Timer mCursorBlinkTimer; // Timer to signal cursor to blink - unsigned int mCursorBlinkInterval; - float mCursorBlinkDuration; - bool mCursorBlinkStatus; // Flag to switch between blink on and blink off - - ImageActor mPrimaryCursor; - ImageActor mSecondaryCursor; - - ImageActor mGrabHandle; - Actor mGrabArea; - float mGrabDisplacementX; - float mGrabDisplacementY; + Image mCursorImage; + Image mGrabHandleImage; + Mesh mHighlightMesh; ///< Mesh for highlight + MeshData mHighlightMeshData; ///< Mesh Data for highlight + Material mHighlightMaterial; ///< Material used for highlight + CursorImpl mCursor[CURSOR_COUNT]; SelectionHandleImpl mSelectionHandle[SELECTION_HANDLE_COUNT]; + QuadContainer mHighlightQuadList; ///< Sub-selections that combine to create the complete selection highlight - MeshActor mHighlightMeshActor; ///< Mesh Actor to display highlight - Mesh mHighlightMesh; ///< Mesh for highlight - MeshData mHighlightMeshData; ///< Mesh Data for highlight - Material mHighlightMaterial; ///< Material used for highlight - Vector4 mHighlightColor; ///< Color of the highlight - QuadContainer mHighlightQuadList; ///< Sub-selections that combine to create the complete selection highlight - - TextSelectionPopup mCopyPastePopup; - - Image mCursorImage; - Image mGrabHandleImage; + Rect mBoundingBox; + Vector4 mHighlightColor; ///< Color of the highlight - TapGestureDetector mTapDetector; - PanGestureDetector mPanGestureDetector; + unsigned int mActiveCursor; + unsigned int mCursorBlinkInterval; + float mCursorBlinkDuration; + float mGrabDisplacementX; + float mGrabDisplacementY; - Rect mBoundingBox; + bool mActiveGrabHandle:1; + bool mActiveSelection:1; + bool mActiveCopyPastePopup:1; + bool mCursorBlinkStatus:1; ///< Flag to switch between blink on and blink off }; DecoratorPtr Decorator::New( Internal::Control& parent, Observer& observer ) @@ -852,9 +847,14 @@ const Rect& Decorator::GetBoundingBox() const return mImpl->mBoundingBox; } -void Decorator::Relayout( const Vector2& size, const Vector2& scrollPosition ) +void Decorator::Relayout( const Vector2& size ) +{ + mImpl->Relayout( size ); +} + +void Decorator::UpdatePositions( const Vector2& scrollOffset ) { - mImpl->Relayout( size, scrollPosition ); + mImpl->UpdatePositions( scrollOffset ); } /** Cursor **/ @@ -872,19 +872,19 @@ unsigned int Decorator::GetActiveCursor() const void Decorator::SetPosition( Cursor cursor, float x, float y, float cursorHeight, float lineHeight ) { // Adjust grab handle displacement - mImpl->mGrabDisplacementX -= x - mImpl->mCursor[cursor].x; - mImpl->mGrabDisplacementY -= y - mImpl->mCursor[cursor].y; + mImpl->mGrabDisplacementX -= x - mImpl->mCursor[cursor].position.x; + mImpl->mGrabDisplacementY -= y - mImpl->mCursor[cursor].position.y; - mImpl->mCursor[cursor].x = x; - mImpl->mCursor[cursor].y = y; + mImpl->mCursor[cursor].position.x = x; + mImpl->mCursor[cursor].position.y = y; mImpl->mCursor[cursor].cursorHeight = cursorHeight; mImpl->mCursor[cursor].lineHeight = lineHeight; } void Decorator::GetPosition( Cursor cursor, float& x, float& y, float& cursorHeight, float& lineHeight ) const { - x = mImpl->mCursor[cursor].x; - y = mImpl->mCursor[cursor].y; + x = mImpl->mCursor[cursor].position.x; + y = mImpl->mCursor[cursor].position.y; cursorHeight = mImpl->mCursor[cursor].cursorHeight; lineHeight = mImpl->mCursor[cursor].lineHeight; } @@ -923,12 +923,12 @@ void Decorator::StopCursorBlink() void Decorator::SetCursorBlinkInterval( float seconds ) { - mImpl->mCursorBlinkInterval = seconds*MILLISECONDS; // Convert to milliseconds + mImpl->mCursorBlinkInterval = static_cast( seconds * TO_MILLISECONDS ); // Convert to milliseconds } float Decorator::GetCursorBlinkInterval() const { - return mImpl->mCursorBlinkInterval; + return static_cast( mImpl->mCursorBlinkInterval ) * TO_SECONDS; } void Decorator::SetCursorBlinkDuration( float seconds ) @@ -977,15 +977,15 @@ bool Decorator::IsSelectionActive() const void Decorator::SetPosition( SelectionHandle handle, float x, float y, float height ) { - mImpl->mSelectionHandle[handle].x = x; - mImpl->mSelectionHandle[handle].y = y; + mImpl->mSelectionHandle[handle].position.x = x; + mImpl->mSelectionHandle[handle].position.y = y; mImpl->mSelectionHandle[handle].lineHeight = height; } void Decorator::GetPosition( SelectionHandle handle, float& x, float& y, float& height ) const { - x = mImpl->mSelectionHandle[handle].x; - y = mImpl->mSelectionHandle[handle].y; + x = mImpl->mSelectionHandle[handle].position.x; + y = mImpl->mSelectionHandle[handle].position.y; height = mImpl->mSelectionHandle[handle].lineHeight; }