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=3736f674e2170f8c24d1520352423c38b2de85ef;hp=b87dab268fcaa2596cbf3cbec6df7a9c98e7cb57;hb=8a647e87a01c5c78451653c1264a9eea81ac9b20;hpb=41278d3fb755de3cb89edf6d80603b18562b4e01 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 b87dab2..3736f67 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,6 @@ // EXTERNAL INCLUDES #include -#include #include #include #include @@ -29,6 +28,8 @@ // INTERNAL INCLUDES #include #include +#include +#include namespace Dali { @@ -42,6 +43,8 @@ namespace Internal namespace { +const Dali::Vector2 DEFAULT_SCROLL_BAR_PADDING( 8.0f, 6.0f ); + BaseHandle Create() { return Toolkit::TextSelectionToolbar::New(); @@ -53,6 +56,8 @@ DALI_TYPE_REGISTRATION_BEGIN( Toolkit::TextSelectionToolbar, Toolkit::Control, C DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionToolbar, "maxSize", VECTOR2, MAX_SIZE ) DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionToolbar, "enableOvershoot", BOOLEAN, ENABLE_OVERSHOOT ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionToolbar, "enableScrollBar", BOOLEAN, ENABLE_SCROLL_BAR ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionToolbar, "scrollBarPadding", VECTOR2, SCROLL_BAR_PADDING ) DALI_PROPERTY_REGISTRATION( Toolkit, TextSelectionToolbar, "scrollView", MAP, SCROLL_VIEW ) DALI_TYPE_REGISTRATION_END() @@ -98,6 +103,16 @@ void TextSelectionToolbar::SetProperty( BaseObject* object, Property::Index inde impl.mScrollView.SetOvershootEnabled( value.Get< bool >() ); break; } + case Toolkit::TextSelectionToolbar::Property::ENABLE_SCROLL_BAR: + { + impl.SetUpScrollBar( value.Get< bool >() ); + break; + } + case Toolkit::TextSelectionToolbar::Property::SCROLL_BAR_PADDING: + { + impl.SetScrollBarPadding( value.Get< Vector2 >() ); + break; + } case Toolkit::TextSelectionToolbar::Property::SCROLL_VIEW: { // Get a Property::Map from the property if possible. @@ -134,6 +149,16 @@ Property::Value TextSelectionToolbar::GetProperty( BaseObject* object, Property: value = impl.mScrollView.IsOvershootEnabled(); break; } + case Toolkit::TextSelectionToolbar::Property::ENABLE_SCROLL_BAR: + { + value = impl.mScrollBar ? true : false; + break; + } + case Toolkit::TextSelectionToolbar::Property::SCROLL_BAR_PADDING: + { + value = impl.GetScrollBarPadding(); + break; + } } // switch } return value; @@ -149,24 +174,21 @@ void TextSelectionToolbar::OnRelayout( const Vector2& size, RelayoutContainer& c float width = std::max ( mTableOfButtons.GetNaturalSize().width, size.width ); mRulerX->SetDomain( RulerDomain( 0.0, width, true ) ); mScrollView.SetRulerX( mRulerX ); -} - -void TextSelectionToolbar::OnStageConnection( int depth ) -{ - // Call the Control::OnStageConnection() to set the depth of the background. - Control::OnStageConnection( depth ); - // Texts are controls, they have their own OnStageConnection() implementation. - // Icons are inside a TableView. It has it's own OnStageConnection() implementation. + if( mScrollBar ) + { + float barWidth = std::min( mTableOfButtons.GetNaturalSize().width, size.width ) - 2.f * mScrollBarPadding.x; + mScrollBar.SetProperty( Actor::Property::SIZE, Vector2( 0.0f, barWidth ) ); + } } void TextSelectionToolbar::SetPopupMaxSize( const Size& maxSize ) { mMaxSize = maxSize; - if (mScrollView && mStencilLayer ) + if( mScrollView && mToolbarActor ) { - mScrollView.SetMaximumSize( mMaxSize ); - mStencilLayer.SetMaximumSize( mMaxSize ); + mScrollView.SetProperty( Actor::Property::MAXIMUM_SIZE, mMaxSize ); + mToolbarActor.SetProperty( Actor::Property::MAXIMUM_SIZE, mMaxSize ); } } @@ -177,14 +199,16 @@ const Dali::Vector2& TextSelectionToolbar::GetPopupMaxSize() const void TextSelectionToolbar::SetUpScrollView() { + mScrollView.SetProperty( Dali::Actor::Property::NAME,"TextSelectionScrollView"); mScrollView.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); - mScrollView.SetParentOrigin( ParentOrigin::CENTER_LEFT ); - mScrollView.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); + mScrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER_LEFT ); + mScrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER_LEFT ); mScrollView.SetScrollingDirection( PanGestureDetector::DIRECTION_HORIZONTAL, Degree( 40.0f ) ); mScrollView.SetAxisAutoLock( true ); mScrollView.ScrollStartedSignal().Connect( this, &TextSelectionToolbar::OnScrollStarted ); mScrollView.ScrollCompletedSignal().Connect( this, &TextSelectionToolbar::OnScrollCompleted ); + mScrollView.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_TO_BOUNDING_BOX ); // In a new layer, so clip to scroll-view's bounding box mRulerX = new DefaultRuler(); // IntrusivePtr which is unreferenced when ScrollView is destroyed. @@ -198,46 +222,76 @@ void TextSelectionToolbar::SetUpScrollView() void TextSelectionToolbar::SetUp() { Actor self = Self(); - self.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); - // Create Layer and Stencil. Layer enable's clipping when content exceed maximum defined width. - mStencilLayer = Layer::New(); - mStencilLayer.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); - mStencilLayer.SetParentOrigin( ParentOrigin::CENTER ); + self.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); - 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 ); + // Create Actor to house the toolbar. + mToolbarActor = Actor::New(); + mToolbarActor.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); + mToolbarActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + mToolbarActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - if ( !mScrollView ) + if( !mScrollView ) { - mScrollView = Toolkit::ScrollView::New(); + 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 ); mTableOfButtons.SetFitHeight( 0 ); - mTableOfButtons.SetParentOrigin( ParentOrigin::CENTER_LEFT ); - mTableOfButtons.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); + mTableOfButtons.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER_LEFT ); + mTableOfButtons.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER_LEFT ); - mStencilLayer.Add( stencil ); - mStencilLayer.Add( mScrollView ); mScrollView.Add( mTableOfButtons ); - self.Add( mStencilLayer ); + mToolbarActor.Add( mScrollView ); + + self.Add( mToolbarActor ); +} + +void TextSelectionToolbar::SetUpScrollBar( bool enable ) +{ + if( enable ) + { + if( ! mScrollBar ) + { + Toolkit::ImageView indicator = Toolkit::ImageView::New(); + indicator.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + indicator.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + indicator.SetStyleName( "TextSelectionScrollIndicator" ); + + mScrollBar = Toolkit::ScrollBar::New( Toolkit::ScrollBar::HORIZONTAL ); + mScrollBar.SetProperty( Dali::Actor::Property::NAME, "Text popup scroll bar" ); + mScrollBar.SetStyleName( "TextSelectionScrollBar" ); + mScrollBar.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_LEFT ); + mScrollBar.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + mScrollBar.SetProperty( Actor::Property::POSITION, Vector2( mScrollBarPadding.x, -mScrollBarPadding.y )); + mScrollBar.SetResizePolicy( Dali::ResizePolicy::FIT_TO_CHILDREN, Dali::Dimension::WIDTH ); + mScrollBar.SetProperty( Actor::Property::ORIENTATION, Quaternion( Quaternion( Radian( 1.5f * Math::PI ), Vector3::ZAXIS ) ) ); + mScrollBar.SetScrollIndicator( indicator ); + mScrollBar.GetPanGestureDetector().DetachAll(); + mScrollView.Add( mScrollBar ); + } + } + else + { + UnparentAndReset( mScrollBar ); + } } void TextSelectionToolbar::OnScrollStarted( const Vector2& position ) { - mTableOfButtons.SetSensitive( false ); + if( mFirstScrollEnd ) + { + mScrollView.SetOvershootEnabled( true ); + } + mTableOfButtons.SetProperty( Actor::Property::SENSITIVE, false ); } void TextSelectionToolbar::OnScrollCompleted( const Vector2& position ) { - mTableOfButtons.SetSensitive( true ); + mFirstScrollEnd = true; + mTableOfButtons.SetProperty( Actor::Property::SENSITIVE, true ); } void TextSelectionToolbar::AddOption( Actor& option ) @@ -258,14 +312,32 @@ void TextSelectionToolbar::ResizeDividers( Size& size ) for( unsigned int i = 0; i < mDividerIndexes.Count(); ++i ) { Actor divider = mTableOfButtons.GetChildAt( Toolkit::TableView::CellPosition( 0, mDividerIndexes[ i ] ) ); - divider.SetSize( size ); + divider.SetProperty( Actor::Property::SIZE, size ); + } + RelayoutRequest(); +} + +void TextSelectionToolbar::RaiseAbove( Actor target ) +{ + mToolbarActor.RaiseAbove( target ); +} + +void TextSelectionToolbar::SetScrollBarPadding( const Vector2& padding ) +{ + mScrollBarPadding = padding; + if( mScrollBar ) + { + mScrollBar.SetProperty( Actor::Property::POSITION, Vector2( mScrollBarPadding.x, -mScrollBarPadding.y )); } + RelayoutRequest(); } -void TextSelectionToolbar::RaiseAbove( Layer target ) +void TextSelectionToolbar::ScrollTo( const Vector2& position ) { - mStencilLayer.RaiseAbove( target ); + mFirstScrollEnd = false; + mScrollView.SetOvershootEnabled( false ); + mScrollView.ScrollTo( position, 0.f ); } void TextSelectionToolbar::ConfigureScrollview( const Property::Map& properties ) @@ -279,22 +351,46 @@ void TextSelectionToolbar::ConfigureScrollview( const Property::Map& properties 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 ); + // Convert the string representation of a color into a Vector4 + if( setPropertyIndex == Toolkit::Scrollable::Property::OVERSHOOT_EFFECT_COLOR ) + { + Vector4 color; + if( ConvertPropertyToColor( propertyPair.second, color ) ) + { + mScrollView.SetOvershootEffectColor( color ); + } + } + else + { + // If the conversion worked, we have a valid property index, + // Set the property to the new value. + mScrollView.SetProperty( setPropertyIndex, propertyPair.second ); + } } } RelayoutRequest(); } +const Vector2& TextSelectionToolbar::GetScrollBarPadding() const +{ + return mScrollBarPadding; +} TextSelectionToolbar::TextSelectionToolbar() -: Control( ControlBehaviour( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ) ), +: Control( ControlBehaviour( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ) ), mMaxSize (), + mScrollBarPadding( DEFAULT_SCROLL_BAR_PADDING ), mIndexInTable( 0 ), - mDividerIndexes() + mDividerIndexes(), + mFirstScrollEnd( false ) { + DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) + { + return std::unique_ptr< Dali::Accessibility::Accessible >( + new Control::Impl::AccessibleImpl( actor, Dali::Accessibility::Role::TOOL_BAR, true ) ); + } + ); } TextSelectionToolbar::~TextSelectionToolbar()