X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscroll-bar%2Fscroll-bar-impl.cpp;h=7612185049596fd714a250d277d3ec2c0409f430;hp=55a86e29fb3965500df7bc3abceff7b906809954;hb=2f705dd3525531584ee46d9a7fc9f23331909c10;hpb=6d762b4acd946b3d02e76c1805e7af9a1a5b1809 diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp index 55a86e2..7612185 100755 --- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -19,38 +19,74 @@ #include // EXTERNAL INCLUDES +#include // for strcmp #include #include -#include #include +#include +#include +#include +#include // INTERNAL INCLUDES #include +#include using namespace Dali; namespace { -const char* DEFAULT_INDICATOR_IMAGE_PATH = DALI_IMAGE_DIR "popup_scroll.png"; -const Vector4 DEFAULT_INDICATOR_NINE_PATCH_BORDER(4.0f, 9.0f, 7.0f, 11.0f); -const float MINIMUM_INDICATOR_HEIGHT(20.0f); // The minimum indicator height for the nine patch border +const char* DEFAULT_INDICATOR_IMAGE_PATH = DALI_IMAGE_DIR "popup_scroll.9.png"; const float DEFAULT_SLIDER_DEPTH(1.0f); const float DEFAULT_INDICATOR_SHOW_DURATION(0.5f); const float DEFAULT_INDICATOR_HIDE_DURATION(0.5f); const float DEFAULT_PAN_GESTURE_PROCESS_TIME(16.7f); // 16.7 milliseconds, i.e. one frame const float DEFAULT_INDICATOR_FIXED_HEIGHT(80.0f); +const float DEFAULT_INDICATOR_MINIMUM_HEIGHT(0.0f); +const float DEFAULT_INDICATOR_START_PADDING(0.0f); +const float DEFAULT_INDICATOR_END_PADDING(0.0f); /** + * Indicator size constraint * Indicator size depends on both indicator's parent size and the scroll content size */ -Vector3 IndicatorSize( const Vector3& parentSize, float contentSize) +struct IndicatorSizeConstraint { - float height = contentSize > parentSize.height ? - parentSize.height * ( parentSize.height / contentSize ) : - parentSize.height * ( (parentSize.height - contentSize * 0.5f) / parentSize.height); - return Vector3( parentSize.width, std::max(MINIMUM_INDICATOR_HEIGHT, height), parentSize.depth ); -} + /** + * @param[in] minimumHeight The minimum height for the indicator + * @param[in] padding The sum of the padding at the start & end of the indicator + */ + IndicatorSizeConstraint( float minimumHeight, float padding ) + : mMinimumHeight( minimumHeight ), + mPadding( padding ) + { + } + + /** + * Constraint operator + * @param[in] current The current indicator size + * @param[in] parentSizeProperty The parent size of scroll indicator. + * @return The new scroll indicator size. + */ + void operator()( Vector3& current, const PropertyInputContainer& inputs ) + { + const Vector3& parentSize = inputs[0]->GetVector3(); + const float contentSize = inputs[1]->GetFloat(); + + // Take into account padding that may exist at the beginning and end of the indicator. + const float parentHeightMinusPadding = parentSize.height - mPadding; + + float height = contentSize > parentHeightMinusPadding ? + parentHeightMinusPadding * ( parentHeightMinusPadding / contentSize ) : + parentHeightMinusPadding * ( ( parentHeightMinusPadding - contentSize * 0.5f ) / parentHeightMinusPadding ); + + current.y = std::max( mMinimumHeight, height ); + } + + float mMinimumHeight; + float mPadding; +}; /** * Indicator position constraint @@ -59,39 +95,39 @@ Vector3 IndicatorSize( const Vector3& parentSize, float contentSize) struct IndicatorPositionConstraint { /** - * @param[in] minPosition The minimum limit of scroll position - * @param[in] maxPosition the maximum limit of scroll position + * @param[in] startPadding The padding at the start of the indicator + * @param[in] endPadding The padding at the end of the indicator */ - IndicatorPositionConstraint(float minPosition, float maxPosition) - : mMinPosition(minPosition), - mMaxPosition(maxPosition) + IndicatorPositionConstraint( float startPadding, float endPadding ) + : mStartPadding( startPadding ), + mEndPadding( endPadding ) { } /** * Constraint operator - * @param[in] current The current indicator position - * @param[in] indicatorSizeProperty The size of indicator. - * @param[in] parentSizeProperty The parent size of indicator. - * @param[in] scrollPositionProperty The scroll position of the scrollable container // (from 0.0 -> 1.0 in each axis) + * @param[in,out] current The current indicator position + * @param[in] inputs Contains the size of indicator, the size of indicator's parent, and the scroll position of the scrollable container (from 0.0 -> 1.0 in each axis) * @return The new indicator position is returned. */ - Vector3 operator()(const Vector3& current, - const PropertyInput& indicatorSizeProperty, - const PropertyInput& parentSizeProperty, - const PropertyInput& scrollPositionProperty) + void operator()( Vector3& current, const PropertyInputContainer& inputs ) { - Vector3 indicatorSize = indicatorSizeProperty.GetVector3(); - Vector3 parentSize = parentSizeProperty.GetVector3(); - float scrollPosition = scrollPositionProperty.GetFloat(); - - const float domainSize = fabs(mMaxPosition - mMinPosition); - float relativePosition = (mMaxPosition - scrollPosition) / domainSize; - return Vector3(current.x, relativePosition * (parentSize.height - indicatorSize.height), DEFAULT_SLIDER_DEPTH); + const Vector3& indicatorSize = inputs[0]->GetVector3(); + const Vector3& parentSize = inputs[1]->GetVector3(); + const float scrollPosition = -inputs[2]->GetFloat(); + const float minimumScrollPosition = inputs[3]->GetFloat(); + const float maximumScrollPosition = inputs[4]->GetFloat(); + + // Take into account padding that may exist at the beginning and end of the indicator. + const float parentHeightMinusPadding = parentSize.height - ( mStartPadding + mEndPadding ); + + float relativePosition = std::max( 0.0f, std::min( 1.0f, ( scrollPosition - minimumScrollPosition ) / ( maximumScrollPosition - minimumScrollPosition ) ) ); + current.y = mStartPadding + ( parentHeightMinusPadding - indicatorSize.height ) * relativePosition; + current.z = DEFAULT_SLIDER_DEPTH; } - float mMinPosition; ///< The minimum scroll position - float mMaxPosition; ///< The maximum scroll position + float mStartPadding; + float mEndPadding; }; } // unnamed namespace @@ -102,11 +138,6 @@ namespace Dali namespace Toolkit { -const Property::Index ScrollBar::PROPERTY_INDICATOR_HEIGHT_POLICY( Internal::ScrollBar::SCROLLBAR_PROPERTY_START_INDEX ); -const Property::Index ScrollBar::PROPERTY_INDICATOR_FIXED_HEIGHT( Internal::ScrollBar::SCROLLBAR_PROPERTY_START_INDEX + 1 ); -const Property::Index ScrollBar::PROPERTY_INDICATOR_SHOW_DURATION( Internal::ScrollBar::SCROLLBAR_PROPERTY_START_INDEX + 2 ); -const Property::Index ScrollBar::PROPERTY_INDICATOR_HIDE_DURATION( Internal::ScrollBar::SCROLLBAR_PROPERTY_START_INDEX + 3 ); - namespace Internal { @@ -115,32 +146,54 @@ namespace using namespace Dali; -const char* INDICATOR_HEIGHT_POLICY_NAME[] = {"Variable", "Fixed"}; - BaseHandle Create() { return Toolkit::ScrollBar::New(); } -TypeRegistration typeRegistration( typeid( Toolkit::ScrollBar ), typeid( Toolkit::ScrollComponent ), Create ); +// Setup properties, signals and actions using the type-registry. +DALI_TYPE_REGISTRATION_BEGIN( Toolkit::ScrollBar, Toolkit::Control, Create ); + +DALI_PROPERTY_REGISTRATION( Toolkit, ScrollBar, "scrollDirection", STRING, SCROLL_DIRECTION ) +DALI_PROPERTY_REGISTRATION( Toolkit, ScrollBar, "indicatorHeightPolicy", STRING, INDICATOR_HEIGHT_POLICY ) +DALI_PROPERTY_REGISTRATION( Toolkit, ScrollBar, "indicatorFixedHeight", FLOAT, INDICATOR_FIXED_HEIGHT ) +DALI_PROPERTY_REGISTRATION( Toolkit, ScrollBar, "indicatorShowDuration", FLOAT, INDICATOR_SHOW_DURATION ) +DALI_PROPERTY_REGISTRATION( Toolkit, ScrollBar, "indicatorHideDuration", FLOAT, INDICATOR_HIDE_DURATION ) +DALI_PROPERTY_REGISTRATION( Toolkit, ScrollBar, "scrollPositionIntervals", ARRAY, SCROLL_POSITION_INTERVALS ) +DALI_PROPERTY_REGISTRATION( Toolkit, ScrollBar, "indicatorMinimumHeight", FLOAT, INDICATOR_MINIMUM_HEIGHT ) +DALI_PROPERTY_REGISTRATION( Toolkit, ScrollBar, "indicatorStartPadding", FLOAT, INDICATOR_START_PADDING ) +DALI_PROPERTY_REGISTRATION( Toolkit, ScrollBar, "indicatorEndPadding", FLOAT, INDICATOR_END_PADDING ) + +DALI_SIGNAL_REGISTRATION( Toolkit, ScrollBar, "panFinished", PAN_FINISHED_SIGNAL ) +DALI_SIGNAL_REGISTRATION( Toolkit, ScrollBar, "scrollPositionIntervalReached", SCROLL_POSITION_INTERVAL_REACHED_SIGNAL ) -const char* const SCROLL_POSITION_NOTIFIED_SIGNAL_NAME = "scroll-position-notified"; +DALI_TYPE_REGISTRATION_END() + +const char* SCROLL_DIRECTION_NAME[] = {"Vertical", "Horizontal"}; +const char* INDICATOR_HEIGHT_POLICY_NAME[] = {"Variable", "Fixed"}; -PropertyRegistration property1( typeRegistration, "indicator-height-policy", Toolkit::ScrollBar::PROPERTY_INDICATOR_HEIGHT_POLICY, Property::STRING, &ScrollBar::SetProperty, &ScrollBar::GetProperty ); -PropertyRegistration property2( typeRegistration, "indicator-fixed-height", Toolkit::ScrollBar::PROPERTY_INDICATOR_FIXED_HEIGHT, Property::FLOAT, &ScrollBar::SetProperty, &ScrollBar::GetProperty ); -PropertyRegistration property3( typeRegistration, "indicator-show-duration", Toolkit::ScrollBar::PROPERTY_INDICATOR_SHOW_DURATION, Property::FLOAT, &ScrollBar::SetProperty, &ScrollBar::GetProperty ); -PropertyRegistration property4( typeRegistration, "indicator-hide-duration", Toolkit::ScrollBar::PROPERTY_INDICATOR_HIDE_DURATION, Property::FLOAT, &ScrollBar::SetProperty, &ScrollBar::GetProperty ); } -ScrollBar::ScrollBar() -: mIndicatorShowDuration(DEFAULT_INDICATOR_SHOW_DURATION), +ScrollBar::ScrollBar(Toolkit::ScrollBar::Direction direction) +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), + mIndicatorShowAlpha(1.0f), + mDirection(direction), + mScrollableObject(WeakHandleBase()), + mPropertyScrollPosition(Property::INVALID_INDEX), + mPropertyMinScrollPosition(Property::INVALID_INDEX), + mPropertyMaxScrollPosition(Property::INVALID_INDEX), + mPropertyScrollContentSize(Property::INVALID_INDEX), + mIndicatorShowDuration(DEFAULT_INDICATOR_SHOW_DURATION), mIndicatorHideDuration(DEFAULT_INDICATOR_HIDE_DURATION), mScrollStart(0.0f), - mIsPanning(false), mCurrentScrollPosition(0.0f), mIndicatorHeightPolicy(Toolkit::ScrollBar::Variable), mIndicatorFixedHeight(DEFAULT_INDICATOR_FIXED_HEIGHT), - mPropertyIndicatorPosition(Property::INVALID_INDEX) + mIndicatorMinimumHeight(DEFAULT_INDICATOR_MINIMUM_HEIGHT), + mIndicatorStartPadding(DEFAULT_INDICATOR_START_PADDING), + mIndicatorEndPadding(DEFAULT_INDICATOR_END_PADDING), + mIsPanning(false), + mIndicatorFirstShow(true) { } @@ -150,43 +203,77 @@ ScrollBar::~ScrollBar() void ScrollBar::OnInitialize() { - Actor self = Self(); - - Image indicatorImage = ResourceImage::New( DEFAULT_INDICATOR_IMAGE_PATH ); - mIndicator = ImageActor::New( indicatorImage ); - mIndicator.SetNinePatchBorder( DEFAULT_INDICATOR_NINE_PATCH_BORDER ); - mIndicator.SetStyle( ImageActor::STYLE_NINE_PATCH ); - mIndicator.SetParentOrigin( ParentOrigin::TOP_LEFT ); - mIndicator.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - self.Add(mIndicator); - - self.SetDrawMode(DrawMode::OVERLAY); - - // Enable the pan gesture which is attached to the control - EnableGestureDetection(Gesture::Type(Gesture::Pan)); + CreateDefaultIndicatorActor(); + Self().SetDrawMode(DrawMode::OVERLAY_2D); } -void ScrollBar::OnScrollConnectorSet( Toolkit::ScrollConnector oldConnector ) +void ScrollBar::SetScrollPropertySource( Handle handle, Property::Index propertyScrollPosition, Property::Index propertyMinScrollPosition, Property::Index propertyMaxScrollPosition, Property::Index propertyScrollContentSize ) { - if( oldConnector ) + if( handle + && propertyScrollPosition != Property::INVALID_INDEX + && propertyMinScrollPosition != Property::INVALID_INDEX + && propertyMaxScrollPosition != Property::INVALID_INDEX + && propertyScrollContentSize != Property::INVALID_INDEX ) { - oldConnector.DomainChangedSignal().Disconnect(this, &ScrollBar::OnScrollDomainChanged); + mScrollableObject = WeakHandleBase(handle); + mPropertyScrollPosition = propertyScrollPosition; + mPropertyMinScrollPosition = propertyMinScrollPosition; + mPropertyMaxScrollPosition = propertyMaxScrollPosition; + mPropertyScrollContentSize = propertyScrollContentSize; - mScrollPositionObject.Reset(); + ApplyConstraints(); } - - if( mScrollConnector ) + else { - mScrollPositionObject = mScrollConnector.GetScrollPositionObject(); - - ApplyConstraints(); - mScrollConnector.DomainChangedSignal().Connect(this, &ScrollBar::OnScrollDomainChanged); + DALI_LOG_ERROR("Can not set empty handle of source object or invalid source property index\n"); } } -void ScrollBar::SetIndicatorImage( Image image ) +void ScrollBar::CreateDefaultIndicatorActor() { - mIndicator.SetImage(image); + Toolkit::ImageView indicator = Toolkit::ImageView::New( DEFAULT_INDICATOR_IMAGE_PATH ); + indicator.SetParentOrigin( ParentOrigin::TOP_LEFT ); + indicator.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + indicator.SetStyleName( "ScrollBarIndicator" ); + indicator.SetColorMode( USE_OWN_MULTIPLY_PARENT_COLOR ); + SetScrollIndicator(indicator); +} + +void ScrollBar::SetScrollIndicator( Actor indicator ) +{ + // Don't allow empty handle + if( indicator ) + { + // Remove current Indicator + if( mIndicator ) + { + Self().Remove( mIndicator ); + } + mIndicator = indicator; + + mIndicatorFirstShow = true; + Self().Add( mIndicator ); + + EnableGestureDetection( Gesture::Type( Gesture::Pan ) ); + + PanGestureDetector detector( GetPanGestureDetector() ); + detector.DetachAll(); + detector.Attach( mIndicator ); + + unsigned int childCount = mIndicator.GetChildCount(); + for ( unsigned int index = 0; index < childCount; index++ ) + { + Actor child = mIndicator.GetChildAt( index ); + if ( child ) + { + detector.Attach( child ); + } + } + } + else + { + DALI_LOG_ERROR("Empty handle of scroll indicator\n"); + } } Actor ScrollBar::GetScrollIndicator() @@ -196,13 +283,13 @@ Actor ScrollBar::GetScrollIndicator() void ScrollBar::ApplyConstraints() { - if( mScrollConnector ) - { - Constraint constraint; + Handle scrollableHandle = mScrollableObject.GetBaseHandle(); + if( scrollableHandle ) + { if(mIndicatorSizeConstraint) { - mIndicator.RemoveConstraint(mIndicatorSizeConstraint); + mIndicatorSizeConstraint.Remove(); } // Set indicator height according to the indicator's height policy @@ -212,43 +299,63 @@ void ScrollBar::ApplyConstraints() } else { - mIndicator.SetSize( IndicatorSize( Self().GetCurrentSize(), mScrollConnector.GetContentLength() ) ); + mIndicatorSizeConstraint = Constraint::New( mIndicator, Actor::Property::SIZE, + IndicatorSizeConstraint( mIndicatorMinimumHeight, mIndicatorStartPadding + mIndicatorEndPadding ) ); + mIndicatorSizeConstraint.AddSource( ParentSource( Actor::Property::SIZE ) ); + mIndicatorSizeConstraint.AddSource( Source( scrollableHandle, mPropertyScrollContentSize ) ); + mIndicatorSizeConstraint.Apply(); } if(mIndicatorPositionConstraint) { - mIndicator.RemoveConstraint(mIndicatorPositionConstraint); + mIndicatorPositionConstraint.Remove(); } - constraint = Constraint::New( Actor::POSITION, - LocalSource( Actor::SIZE ), - ParentSource( Actor::SIZE ), - Source( mScrollPositionObject, Toolkit::ScrollConnector::SCROLL_POSITION ), - IndicatorPositionConstraint( mScrollConnector.GetMinLimit(), mScrollConnector.GetMaxLimit() ) ); - mIndicatorPositionConstraint = mIndicator.ApplyConstraint( constraint ); + mIndicatorPositionConstraint = Constraint::New( mIndicator, Actor::Property::POSITION, + IndicatorPositionConstraint( mIndicatorStartPadding, mIndicatorEndPadding ) ); + mIndicatorPositionConstraint.AddSource( LocalSource( Actor::Property::SIZE ) ); + mIndicatorPositionConstraint.AddSource( ParentSource( Actor::Property::SIZE ) ); + mIndicatorPositionConstraint.AddSource( Source( scrollableHandle, mPropertyScrollPosition ) ); + mIndicatorPositionConstraint.AddSource( Source( scrollableHandle, mPropertyMinScrollPosition ) ); + mIndicatorPositionConstraint.AddSource( Source( scrollableHandle, mPropertyMaxScrollPosition ) ); + mIndicatorPositionConstraint.Apply(); } } -void ScrollBar::SetPositionNotifications( const std::vector& positions ) +void ScrollBar::SetScrollPositionIntervals( const Dali::Vector& positions ) { - if(mScrollPositionObject) + mScrollPositionIntervals = positions; + + Handle scrollableHandle = mScrollableObject.GetBaseHandle(); + + if( scrollableHandle ) { - if(mPositionNotification) + if( mPositionNotification ) { - mScrollPositionObject.RemovePropertyNotification(mPositionNotification); + scrollableHandle.RemovePropertyNotification(mPositionNotification); } - mPositionNotification = mScrollPositionObject.AddPropertyNotification( Toolkit::ScrollConnector::SCROLL_POSITION, VariableStepCondition(positions) ); - mPositionNotification.NotifySignal().Connect( this, &ScrollBar::OnScrollPositionNotified ); + + mPositionNotification = scrollableHandle.AddPropertyNotification( mPropertyScrollPosition, VariableStepCondition(mScrollPositionIntervals) ); + mPositionNotification.NotifySignal().Connect( this, &ScrollBar::OnScrollPositionIntervalReached ); } } -void ScrollBar::OnScrollPositionNotified(PropertyNotification& source) +Dali::Vector ScrollBar::GetScrollPositionIntervals() const +{ + return mScrollPositionIntervals; +} + +void ScrollBar::OnScrollPositionIntervalReached(PropertyNotification& source) { // Emit the signal to notify the scroll position crossing - mScrollPositionNotifiedSignal.Emit(mScrollConnector.GetScrollPosition()); + Handle scrollableHandle = mScrollableObject.GetBaseHandle(); + if(scrollableHandle) + { + mScrollPositionIntervalReachedSignal.Emit(scrollableHandle.GetProperty(mPropertyScrollPosition)); + } } -void ScrollBar::Show() +void ScrollBar::ShowIndicator() { // Cancel any animation if(mAnimation) @@ -257,19 +364,26 @@ void ScrollBar::Show() mAnimation.Reset(); } + if( mIndicatorFirstShow ) + { + // Preserve the alpha value from the stylesheet + mIndicatorShowAlpha = Self().GetCurrentColor().a; + mIndicatorFirstShow = false; + } + if(mIndicatorShowDuration > 0.0f) { mAnimation = Animation::New( mIndicatorShowDuration ); - mAnimation.OpacityTo( Self(), 1.0f, AlphaFunctions::EaseIn ); + mAnimation.AnimateTo( Property( mIndicator, Actor::Property::COLOR_ALPHA ), mIndicatorShowAlpha, AlphaFunction::EASE_IN ); mAnimation.Play(); } else { - Self().SetOpacity(1.0f); + mIndicator.SetOpacity(mIndicatorShowAlpha); } } -void ScrollBar::Hide() +void ScrollBar::HideIndicator() { // Cancel any animation if(mAnimation) @@ -281,46 +395,49 @@ void ScrollBar::Hide() if(mIndicatorHideDuration > 0.0f) { mAnimation = Animation::New( mIndicatorHideDuration ); - mAnimation.OpacityTo( Self(), 0.0f, AlphaFunctions::EaseIn ); + mAnimation.AnimateTo( Property( mIndicator, Actor::Property::COLOR_ALPHA ), 0.0f, AlphaFunction::EASE_IN ); mAnimation.Play(); } else { - Self().SetOpacity(0.0f); + mIndicator.SetOpacity(0.0f); } } bool ScrollBar::OnPanGestureProcessTick() { // Update the scroll position property. - if( mScrollConnector ) + Handle scrollableHandle = mScrollableObject.GetBaseHandle(); + if( scrollableHandle ) { - mScrollConnector.SetScrollPosition(mCurrentScrollPosition); + scrollableHandle.SetProperty(mPropertyScrollPosition, mCurrentScrollPosition); } return true; } -void ScrollBar::OnPan( PanGesture gesture ) +void ScrollBar::OnPan( const PanGesture& gesture ) { - if(mScrollConnector) + Handle scrollableHandle = mScrollableObject.GetBaseHandle(); + + if(scrollableHandle) { - Dali::Toolkit::ItemView itemView = Dali::Toolkit::ItemView::DownCast(Self().GetParent()); + Dali::Toolkit::ItemView itemView = Dali::Toolkit::ItemView::DownCast(scrollableHandle); switch(gesture.state) { case Gesture::Started: { - if( !mTimer ) + if( !mPanProcessTimer ) { // Make sure the pan gesture is only being processed once per frame. - mTimer = Timer::New( DEFAULT_PAN_GESTURE_PROCESS_TIME ); - mTimer.TickSignal().Connect( this, &ScrollBar::OnPanGestureProcessTick ); - mTimer.Start(); + mPanProcessTimer = Timer::New( DEFAULT_PAN_GESTURE_PROCESS_TIME ); + mPanProcessTimer.TickSignal().Connect( this, &ScrollBar::OnPanGestureProcessTick ); + mPanProcessTimer.Start(); } - Show(); - mScrollStart = mScrollConnector.GetScrollPosition(); + ShowIndicator(); + mScrollStart = scrollableHandle.GetProperty(mPropertyScrollPosition); mGestureDisplacement = Vector3::ZERO; mIsPanning = true; @@ -328,13 +445,18 @@ void ScrollBar::OnPan( PanGesture gesture ) } case Gesture::Continuing: { - Vector3 delta(gesture.displacement.x, gesture.displacement.y, 0.0f); - mGestureDisplacement+=delta; + mGestureDisplacement.x += gesture.displacement.x; + mGestureDisplacement.y += gesture.displacement.y; - Vector3 span = Self().GetCurrentSize() - mIndicator.GetCurrentSize(); - const float domainSize = fabs(mScrollConnector.GetMaxLimit() - mScrollConnector.GetMinLimit()); - mCurrentScrollPosition = mScrollStart - mGestureDisplacement.y * domainSize / span.y; - mCurrentScrollPosition = std::min(mScrollConnector.GetMaxLimit(), std::max(mCurrentScrollPosition, mScrollConnector.GetMinLimit())); + float minScrollPosition = scrollableHandle.GetProperty( mPropertyMinScrollPosition ); + float maxScrollPosition = scrollableHandle.GetProperty( mPropertyMaxScrollPosition ); + + // The domain size is the internal range + float domainSize = maxScrollPosition - minScrollPosition; + float logicalSize = Self().GetCurrentSize().y - ( mIndicator.GetCurrentSize().y + mIndicatorStartPadding + mIndicatorEndPadding ); + + mCurrentScrollPosition = mScrollStart - ( ( mGestureDisplacement.y * domainSize ) / logicalSize ); + mCurrentScrollPosition = -std::min( maxScrollPosition, std::max( -mCurrentScrollPosition, minScrollPosition ) ); break; } @@ -342,12 +464,12 @@ void ScrollBar::OnPan( PanGesture gesture ) { mIsPanning = false; - if( mTimer ) + if( mPanProcessTimer ) { // Destroy the timer when pan gesture is finished. - mTimer.Stop(); - mTimer.TickSignal().Disconnect( this, &ScrollBar::OnPanGestureProcessTick ); - mTimer.Reset(); + mPanProcessTimer.Stop(); + mPanProcessTimer.TickSignal().Disconnect( this, &ScrollBar::OnPanGestureProcessTick ); + mPanProcessTimer.Reset(); } if(itemView) @@ -356,6 +478,8 @@ void ScrollBar::OnPan( PanGesture gesture ) GetImpl(itemView).DoRefresh(mCurrentScrollPosition, true); } + mPanFinishedSignal.Emit(); + break; } } @@ -368,27 +492,36 @@ void ScrollBar::OnPan( PanGesture gesture ) } } -void ScrollBar::OnControlSizeSet( const Vector3& size ) +void ScrollBar::OnSizeSet( const Vector3& size ) { - if(mIndicatorHeightPolicy != Toolkit::ScrollBar::Fixed && mScrollConnector) + if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed) { - mIndicator.SetSize( IndicatorSize( size, mScrollConnector.GetContentLength() ) ); + mIndicator.SetSize(size.width, mIndicatorFixedHeight); } + + Control::OnSizeSet( size ); } -void ScrollBar::OnScrollDomainChanged(float minPosition, float maxPosition, float contentSize) +void ScrollBar::SetScrollDirection( Toolkit::ScrollBar::Direction direction ) { - // Reapply constraints when the scroll domain is changed - ApplyConstraints(); + mDirection = direction; +} + +Toolkit::ScrollBar::Direction ScrollBar::GetScrollDirection() const +{ + return mDirection; } void ScrollBar::SetIndicatorHeightPolicy( Toolkit::ScrollBar::IndicatorHeightPolicy policy ) { - mIndicatorHeightPolicy = policy; - ApplyConstraints(); + if( policy != mIndicatorHeightPolicy ) + { + mIndicatorHeightPolicy = policy; + ApplyConstraints(); + } } -Toolkit::ScrollBar::IndicatorHeightPolicy ScrollBar::GetIndicatorHeightPolicy() +Toolkit::ScrollBar::IndicatorHeightPolicy ScrollBar::GetIndicatorHeightPolicy() const { return mIndicatorHeightPolicy; } @@ -396,10 +529,14 @@ Toolkit::ScrollBar::IndicatorHeightPolicy ScrollBar::GetIndicatorHeightPolicy() void ScrollBar::SetIndicatorFixedHeight( float height ) { mIndicatorFixedHeight = height; - ApplyConstraints(); + + if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed) + { + mIndicator.SetSize(Self().GetCurrentSize().width, mIndicatorFixedHeight); + } } -float ScrollBar::GetIndicatorFixedHeight() +float ScrollBar::GetIndicatorFixedHeight() const { return mIndicatorFixedHeight; } @@ -409,7 +546,7 @@ void ScrollBar::SetIndicatorShowDuration( float durationSeconds ) mIndicatorShowDuration = durationSeconds; } -float ScrollBar::GetIndicatorShowDuration() +float ScrollBar::GetIndicatorShowDuration() const { return mIndicatorShowDuration; } @@ -419,11 +556,28 @@ void ScrollBar::SetIndicatorHideDuration( float durationSeconds ) mIndicatorHideDuration = durationSeconds; } -float ScrollBar::GetIndicatorHideDuration() +float ScrollBar::GetIndicatorHideDuration() const { return mIndicatorHideDuration; } +void ScrollBar::OnScrollDirectionPropertySet( Property::Value propertyValue ) +{ + std::string directionName( propertyValue.Get() ); + if(directionName == "Vertical") + { + SetScrollDirection(Toolkit::ScrollBar::Vertical); + } + else if(directionName == "Horizontal") + { + SetScrollDirection(Toolkit::ScrollBar::Horizontal); + } + else + { + DALI_ASSERT_ALWAYS( !"ScrollBar::OnScrollDirectionPropertySet(). Invalid Property value." ); + } +} + void ScrollBar::OnIndicatorHeightPolicyPropertySet( Property::Value propertyValue ) { std::string policyName( propertyValue.Get() ); @@ -448,9 +602,13 @@ bool ScrollBar::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* bool connected( true ); Toolkit::ScrollBar scrollBar = Toolkit::ScrollBar::DownCast( handle ); - if( 0 == strcmp( signalName.c_str(), SCROLL_POSITION_NOTIFIED_SIGNAL_NAME ) ) + if( 0 == strcmp( signalName.c_str(), PAN_FINISHED_SIGNAL ) ) + { + scrollBar.PanFinishedSignal().Connect( tracker, functor ); + } + else if( 0 == strcmp( signalName.c_str(), SCROLL_POSITION_INTERVAL_REACHED_SIGNAL ) ) { - scrollBar.ScrollPositionNotifiedSignal().Connect( tracker, functor ); + scrollBar.ScrollPositionIntervalReachedSignal().Connect( tracker, functor ); } else { @@ -470,26 +628,66 @@ void ScrollBar::SetProperty( BaseObject* object, Property::Index index, const Pr ScrollBar& scrollBarImpl( GetImpl( scrollBar ) ); switch( index ) { - case Toolkit::ScrollBar::PROPERTY_INDICATOR_HEIGHT_POLICY: + case Toolkit::ScrollBar::Property::SCROLL_DIRECTION: + { + scrollBarImpl.OnScrollDirectionPropertySet( value ); + break; + } + case Toolkit::ScrollBar::Property::INDICATOR_HEIGHT_POLICY: { scrollBarImpl.OnIndicatorHeightPolicyPropertySet( value ); break; } - case Toolkit::ScrollBar::PROPERTY_INDICATOR_FIXED_HEIGHT: + case Toolkit::ScrollBar::Property::INDICATOR_FIXED_HEIGHT: { scrollBarImpl.SetIndicatorFixedHeight(value.Get()); break; } - case Toolkit::ScrollBar::PROPERTY_INDICATOR_SHOW_DURATION: + case Toolkit::ScrollBar::Property::INDICATOR_SHOW_DURATION: { scrollBarImpl.SetIndicatorShowDuration(value.Get()); break; } - case Toolkit::ScrollBar::PROPERTY_INDICATOR_HIDE_DURATION: + case Toolkit::ScrollBar::Property::INDICATOR_HIDE_DURATION: { scrollBarImpl.SetIndicatorHideDuration(value.Get()); break; } + case Toolkit::ScrollBar::Property::SCROLL_POSITION_INTERVALS: + { + Property::Array* array = value.GetArray(); + if( array ) + { + Dali::Vector positions; + size_t positionCount = array->Count(); + positions.Resize( positionCount ); + for( size_t i = 0; i != positionCount; ++i ) + { + array->GetElementAt( i ).Get( positions[i] ); + } + + scrollBarImpl.SetScrollPositionIntervals(positions); + } + break; + } + case Toolkit::ScrollBar::Property::INDICATOR_MINIMUM_HEIGHT: + { + scrollBarImpl.mIndicatorMinimumHeight = value.Get(); + scrollBarImpl.ApplyConstraints(); + break; + } + case Toolkit::ScrollBar::Property::INDICATOR_START_PADDING: + { + scrollBarImpl.mIndicatorStartPadding = value.Get(); + scrollBarImpl.ApplyConstraints(); + break; + } + case Toolkit::ScrollBar::Property::INDICATOR_END_PADDING: + { + scrollBarImpl.mIndicatorEndPadding = value.Get(); + scrollBarImpl.ApplyConstraints(); + break; + } } } } @@ -505,35 +703,71 @@ Property::Value ScrollBar::GetProperty( BaseObject* object, Property::Index inde ScrollBar& scrollBarImpl( GetImpl( scrollBar ) ); switch( index ) { - case Toolkit::ScrollBar::PROPERTY_INDICATOR_HEIGHT_POLICY: + case Toolkit::ScrollBar::Property::SCROLL_DIRECTION: + { + value = SCROLL_DIRECTION_NAME[ scrollBarImpl.GetScrollDirection() ]; + break; + } + case Toolkit::ScrollBar::Property::INDICATOR_HEIGHT_POLICY: { value = INDICATOR_HEIGHT_POLICY_NAME[ scrollBarImpl.GetIndicatorHeightPolicy() ]; break; } - case Toolkit::ScrollBar::PROPERTY_INDICATOR_FIXED_HEIGHT: + case Toolkit::ScrollBar::Property::INDICATOR_FIXED_HEIGHT: { value = scrollBarImpl.GetIndicatorFixedHeight(); break; } - case Toolkit::ScrollBar::PROPERTY_INDICATOR_SHOW_DURATION: + case Toolkit::ScrollBar::Property::INDICATOR_SHOW_DURATION: { value = scrollBarImpl.GetIndicatorShowDuration(); break; } - case Toolkit::ScrollBar::PROPERTY_INDICATOR_HIDE_DURATION: + case Toolkit::ScrollBar::Property::INDICATOR_HIDE_DURATION: { value = scrollBarImpl.GetIndicatorHideDuration(); break; } + case Toolkit::ScrollBar::Property::SCROLL_POSITION_INTERVALS: + { + Property::Value value( Property::ARRAY ); + Property::Array* array = value.GetArray(); + + if( array ) + { + Dali::Vector positions = scrollBarImpl.GetScrollPositionIntervals(); + size_t positionCount( array->Count() ); + for( size_t i( 0 ); i != positionCount; ++i ) + { + array->PushBack( positions[i] ); + } + } + break; + } + case Toolkit::ScrollBar::Property::INDICATOR_MINIMUM_HEIGHT: + { + value = scrollBarImpl.mIndicatorMinimumHeight; + break; + } + case Toolkit::ScrollBar::Property::INDICATOR_START_PADDING: + { + value = scrollBarImpl.mIndicatorStartPadding; + break; + } + case Toolkit::ScrollBar::Property::INDICATOR_END_PADDING: + { + value = scrollBarImpl.mIndicatorEndPadding; + break; + } } } return value; } -Toolkit::ScrollBar ScrollBar::New() +Toolkit::ScrollBar ScrollBar::New(Toolkit::ScrollBar::Direction direction) { // Create the implementation, temporarily owned by this handle on stack - IntrusivePtr< ScrollBar > impl = new ScrollBar(); + IntrusivePtr< ScrollBar > impl = new ScrollBar(direction); // Pass ownership to CustomActor handle Toolkit::ScrollBar handle( *impl );