X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-selection-toolbar-impl.cpp;h=81ec84040b74b834b03402d859ef50173f94938c;hp=7a32889d1e41ef97600c25a1a586e89e54a7d3ad;hb=50fb32886d0518953ed92209d767b8204b29b387;hpb=078dca3e0e630cd8f607e325ff7bd95ca37a394a diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp index 7a32889..81ec840 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp @@ -18,16 +18,18 @@ // CLASS HEADER #include -// INTERNAL INCLUDES -#include -#include - // EXTERNAL INCLUDES -#include +#include +#include #include #include +#include #include -#include + +// INTERNAL INCLUDES +#include +#include +#include namespace Dali { @@ -40,7 +42,6 @@ namespace Internal namespace { -const Dali::Vector2 DEFAULT_MAX_SIZE( 400.0f, 65.0f ); ///< The maximum size of the Toolbar. BaseHandle Create() { @@ -51,8 +52,9 @@ BaseHandle Create() DALI_TYPE_REGISTRATION_BEGIN( Toolkit::TextSelectionToolbar, Toolkit::Control, Create ); -DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionToolbar, "max-size", VECTOR2, MAX_SIZE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionToolbar, "enable-overshoot", BOOLEAN, ENABLE_OVERSHOOT ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionToolbar, "maxSize", VECTOR2, MAX_SIZE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionToolbar, "enableOvershoot", BOOLEAN, ENABLE_OVERSHOOT ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionToolbar, "scrollView", MAP, SCROLL_VIEW ) DALI_TYPE_REGISTRATION_END() @@ -90,9 +92,23 @@ void TextSelectionToolbar::SetProperty( BaseObject* object, Property::Index inde } case Toolkit::TextSelectionToolbar::Property::ENABLE_OVERSHOOT: { + if( !impl.mScrollView ) + { + impl.mScrollView = Toolkit::ScrollView::New(); + } impl.mScrollView.SetOvershootEnabled( value.Get< bool >() ); break; } + case Toolkit::TextSelectionToolbar::Property::SCROLL_VIEW: + { + // Get a Property::Map from the property if possible. + Property::Map setPropertyMap; + if( value.Get( setPropertyMap ) ) + { + impl.ConfigureScrollview( setPropertyMap ); + } + break; + } } // switch } // TextSelectionToolbar } @@ -141,22 +157,6 @@ void TextSelectionToolbar::OnStageConnection( int depth ) // Call the Control::OnStageConnection() to set the depth of the background. Control::OnStageConnection( depth ); - // Traverse the dividers and set the depth. - for( unsigned int i = 0; i < mDividerIndexes.Count(); ++i ) - { - Actor divider = mTableOfButtons.GetChildAt( Toolkit::TableView::CellPosition( 0, mDividerIndexes[ i ] ) ); - - ImageActor dividerImageActor = ImageActor::DownCast( divider ); - if( dividerImageActor ) - { - dividerImageActor.SetSortModifier( DECORATION_DEPTH_INDEX + depth ); - } - else - { - // TODO at the moment divider are image actors. - } - } - // Texts are controls, they have their own OnStageConnection() implementation. // Icons are inside a TableView. It has it's own OnStageConnection() implementation. } @@ -176,22 +176,24 @@ const Dali::Vector2& TextSelectionToolbar::GetPopupMaxSize() const return mMaxSize; } -void TextSelectionToolbar::SetUpScrollView( Toolkit::ScrollView& scrollView ) +void TextSelectionToolbar::SetUpScrollView() { - scrollView.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); - scrollView.SetParentOrigin( ParentOrigin::CENTER_LEFT ); - scrollView.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); + mScrollView.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); + mScrollView.SetParentOrigin( ParentOrigin::CENTER_LEFT ); + mScrollView.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); - scrollView.SetScrollingDirection( PanGestureDetector::DIRECTION_HORIZONTAL, Degree( 40.0f ) ); - scrollView.SetAxisAutoLock( true ); - scrollView.ScrollStartedSignal().Connect( this, &TextSelectionToolbar::OnScrollStarted ); - scrollView.ScrollCompletedSignal().Connect( this, &TextSelectionToolbar::OnScrollCompleted ); + mScrollView.SetScrollingDirection( PanGestureDetector::DIRECTION_HORIZONTAL, Degree( 40.0f ) ); + mScrollView.SetAxisAutoLock( true ); + mScrollView.ScrollStartedSignal().Connect( this, &TextSelectionToolbar::OnScrollStarted ); + mScrollView.ScrollCompletedSignal().Connect( this, &TextSelectionToolbar::OnScrollCompleted ); mRulerX = new DefaultRuler(); // IntrusivePtr which is unreferenced when ScrollView is destroyed. RulerPtr rulerY = new DefaultRuler(); // IntrusivePtr which is unreferenced when ScrollView is destroyed. rulerY->Disable(); - scrollView.SetRulerY( rulerY ); + mScrollView.SetRulerY( rulerY ); + + mScrollView.SetOvershootEnabled( true ); } void TextSelectionToolbar::SetUp() @@ -204,14 +206,18 @@ void TextSelectionToolbar::SetUp() mStencilLayer.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); mStencilLayer.SetParentOrigin( ParentOrigin::CENTER ); - ImageActor stencil = CreateSolidColorActor( Color::RED ); + BufferImage stencilImage = BufferImage::WHITE(); // ImageView needs an Image or does nothing + Toolkit::ImageView stencil = Toolkit::ImageView::New(stencilImage); stencil.SetDrawMode( DrawMode::STENCIL ); stencil.SetVisible( true ); stencil.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); stencil.SetParentOrigin( ParentOrigin::CENTER ); - mScrollView = Toolkit::ScrollView::New(); - SetUpScrollView( mScrollView ); + if ( !mScrollView ) + { + mScrollView = Toolkit::ScrollView::New(); + } + SetUpScrollView(); // Toolbar must start with at least one option, adding further options with increase it's size mTableOfButtons = Dali::Toolkit::TableView::New( 1, 1 ); @@ -219,7 +225,6 @@ void TextSelectionToolbar::SetUp() mTableOfButtons.SetParentOrigin( ParentOrigin::CENTER_LEFT ); mTableOfButtons.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); - mStencilLayer.Add( stencil ); mStencilLayer.Add( mScrollView ); mScrollView.Add( mTableOfButtons ); @@ -264,6 +269,27 @@ void TextSelectionToolbar::RaiseAbove( Layer target ) mStencilLayer.RaiseAbove( target ); } +void TextSelectionToolbar::ConfigureScrollview( const Property::Map& properties ) +{ + // Set any properties specified for the label by iterating through all property key-value pairs. + for( unsigned int i = 0, mapCount = properties.Count(); i < mapCount; ++i ) + { + const StringValuePair& propertyPair( properties.GetPair( i ) ); + + // Convert the property string to a property index. + Property::Index setPropertyIndex = mScrollView.GetPropertyIndex( propertyPair.first ); + if( setPropertyIndex != Property::INVALID_INDEX ) + { + // If the conversion worked, we have a valid property index, + // Set the property to the new value. + mScrollView.SetProperty( setPropertyIndex, propertyPair.second ); + } + } + + RelayoutRequest(); +} + + TextSelectionToolbar::TextSelectionToolbar() : Control( ControlBehaviour( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ) ), mMaxSize (),