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=f92f721949546b68d60a40ca4a4694325d92fd7d;hp=cd3a764b239d417d77710f1f9e366da5d46b35c2;hb=bbfb0898938f4b314a315d923c152698cfef6d59;hpb=18088175cb55711d4675c6ea25b1b01022886be5 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 cd3a764..f92f721 100755 --- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp @@ -19,11 +19,15 @@ #include // EXTERNAL INCLUDES +#include // for strcmp #include #include -#include -#include #include +#include +#include +#include +#include + // INTERNAL INCLUDES #include @@ -43,15 +47,33 @@ const float DEFAULT_PAN_GESTURE_PROCESS_TIME(16.7f); // 16.7 milliseconds, i.e. const float DEFAULT_INDICATOR_FIXED_HEIGHT(80.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 ); -} + IndicatorSizeConstraint() + { + } + + /** + * 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(); + + float height = contentSize > parentSize.height ? + parentSize.height * ( parentSize.height / contentSize ) : + parentSize.height * ( (parentSize.height - contentSize * 0.5f) / parentSize.height); + + current.y = std::max(MINIMUM_INDICATOR_HEIGHT, height); + } +}; /** * Indicator position constraint @@ -63,36 +85,28 @@ struct IndicatorPositionConstraint * @param[in] minPosition The minimum limit of scroll position * @param[in] maxPosition the maximum limit of scroll position */ - IndicatorPositionConstraint(float minPosition, float maxPosition) - : mMinPosition(minPosition), - mMaxPosition(maxPosition) + IndicatorPositionConstraint() { } /** * 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 minScrollPosition = inputs[3]->GetFloat(); + const float maxScrollPosition = inputs[4]->GetFloat(); + + float relativePosition = std::max( 0.0f, std::min( 1.0f, (scrollPosition - minScrollPosition) / (maxScrollPosition - minScrollPosition) ) ); + current.y = ( parentSize.height - indicatorSize.height ) * relativePosition; + current.z = DEFAULT_SLIDER_DEPTH; } - - float mMinPosition; ///< The minimum scroll position - float mMaxPosition; ///< The maximum scroll position }; } // unnamed namespace @@ -117,30 +131,42 @@ BaseHandle Create() } // Setup properties, signals and actions using the type-registry. -DALI_TYPE_REGISTRATION_BEGIN( Toolkit::ScrollBar, Toolkit::ScrollComponent, Create ); +DALI_TYPE_REGISTRATION_BEGIN( Toolkit::ScrollBar, Toolkit::Control, Create ); -DALI_PROPERTY_REGISTRATION( ScrollBar, "indicator-height-policy", STRING, INDICATOR_HEIGHT_POLICY ) -DALI_PROPERTY_REGISTRATION( ScrollBar, "indicator-fixed-height", FLOAT, INDICATOR_FIXED_HEIGHT ) -DALI_PROPERTY_REGISTRATION( ScrollBar, "indicator-show-duration", FLOAT, INDICATOR_SHOW_DURATION ) -DALI_PROPERTY_REGISTRATION( ScrollBar, "indicator-hide-duration", FLOAT, INDICATOR_HIDE_DURATION ) +DALI_PROPERTY_REGISTRATION( Toolkit, ScrollBar, "scroll-direction", STRING, SCROLL_DIRECTION ) +DALI_PROPERTY_REGISTRATION( Toolkit, ScrollBar, "indicator-height-policy", STRING, INDICATOR_HEIGHT_POLICY ) +DALI_PROPERTY_REGISTRATION( Toolkit, ScrollBar, "indicator-fixed-height", FLOAT, INDICATOR_FIXED_HEIGHT ) +DALI_PROPERTY_REGISTRATION( Toolkit, ScrollBar, "indicator-show-duration", FLOAT, INDICATOR_SHOW_DURATION ) +DALI_PROPERTY_REGISTRATION( Toolkit, ScrollBar, "indicator-hide-duration", FLOAT, INDICATOR_HIDE_DURATION ) +DALI_PROPERTY_REGISTRATION( Toolkit, ScrollBar, "scroll-position-intervals", ARRAY, SCROLL_POSITION_INTERVALS ) -DALI_SIGNAL_REGISTRATION( ScrollBar, "scroll-position-notified", SCROLL_POSITION_NOTIFIED_SIGNAL ) +DALI_SIGNAL_REGISTRATION( Toolkit, ScrollBar, "pan-finished", PAN_FINISHED_SIGNAL ) +DALI_SIGNAL_REGISTRATION( Toolkit, ScrollBar, "scroll-position-interval-reached", SCROLL_POSITION_INTERVAL_REACHED_SIGNAL ) DALI_TYPE_REGISTRATION_END() +const char* SCROLL_DIRECTION_NAME[] = {"Vertical", "Horizontal"}; const char* INDICATOR_HEIGHT_POLICY_NAME[] = {"Variable", "Fixed"}; } -ScrollBar::ScrollBar() -: mIndicatorShowDuration(DEFAULT_INDICATOR_SHOW_DURATION), +ScrollBar::ScrollBar(Toolkit::ScrollBar::Direction direction) +: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ), + 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) + mIsPanning(false), + mIndicatorFirstShow(true) { } @@ -150,43 +176,73 @@ 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); + Image indicatorImage = ResourceImage::New( DEFAULT_INDICATOR_IMAGE_PATH ); + ImageActor indicator = ImageActor::New( indicatorImage ); + indicator.SetNinePatchBorder( DEFAULT_INDICATOR_NINE_PATCH_BORDER ); + indicator.SetStyle( ImageActor::STYLE_NINE_PATCH ); + indicator.SetParentOrigin( ParentOrigin::TOP_LEFT ); + indicator.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + + SetScrollIndicator(indicator); +} + +void ScrollBar::SetScrollIndicator( Actor indicator ) +{ + // Don't allow empty handle + if( indicator ) + { + 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 +252,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,46 +268,62 @@ void ScrollBar::ApplyConstraints() } else { - mIndicator.SetSize( IndicatorSize( Self().GetCurrentSize(), mScrollConnector.GetContentLength() ) ); + mIndicatorSizeConstraint = Constraint::New( mIndicator, Actor::Property::SIZE, IndicatorSizeConstraint() ); + mIndicatorSizeConstraint.AddSource( ParentSource( Actor::Property::SIZE ) ); + mIndicatorSizeConstraint.AddSource( Source( scrollableHandle, mPropertyScrollContentSize ) ); + mIndicatorSizeConstraint.Apply(); } if(mIndicatorPositionConstraint) { - mIndicator.RemoveConstraint(mIndicatorPositionConstraint); + mIndicatorPositionConstraint.Remove(); } - constraint = Constraint::New( Actor::Property::POSITION, - LocalSource( Actor::Property::SIZE ), - ParentSource( Actor::Property::SIZE ), - Source( mScrollPositionObject, Toolkit::ScrollConnector::SCROLL_POSITION ), - IndicatorPositionConstraint( mScrollConnector.GetMinLimit(), mScrollConnector.GetMaxLimit() ) ); - mIndicatorPositionConstraint = mIndicator.ApplyConstraint( constraint ); + mIndicatorPositionConstraint = Constraint::New( mIndicator, Actor::Property::POSITION, IndicatorPositionConstraint() ); + 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 { - // Emit the signal to notify the scroll position crossing - mScrollPositionNotifiedSignal.Emit(mScrollConnector.GetScrollPosition()); + return mScrollPositionIntervals; } -void ScrollBar::Show() +void ScrollBar::OnScrollPositionIntervalReached(PropertyNotification& source) { - Actor self = Self(); + // Emit the signal to notify the scroll position crossing + Handle scrollableHandle = mScrollableObject.GetBaseHandle(); + if(scrollableHandle) + { + mScrollPositionIntervalReachedSignal.Emit(scrollableHandle.GetProperty(mPropertyScrollPosition)); + } +} +void ScrollBar::ShowIndicator() +{ // Cancel any animation if(mAnimation) { @@ -259,22 +331,27 @@ 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.AnimateTo( Property( self, Actor::Property::COLOR_ALPHA ), 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() { - Actor self = Self(); - // Cancel any animation if(mAnimation) { @@ -285,46 +362,49 @@ void ScrollBar::Hide() if(mIndicatorHideDuration > 0.0f) { mAnimation = Animation::New( mIndicatorHideDuration ); - mAnimation.AnimateTo( Property( self, Actor::Property::COLOR_ALPHA ), 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; @@ -336,9 +416,12 @@ void ScrollBar::OnPan( PanGesture gesture ) mGestureDisplacement+=delta; Vector3 span = Self().GetCurrentSize() - mIndicator.GetCurrentSize(); - const float domainSize = fabs(mScrollConnector.GetMaxLimit() - mScrollConnector.GetMinLimit()); + float minScrollPosition = scrollableHandle.GetProperty(mPropertyMinScrollPosition); + float maxScrollPosition = scrollableHandle.GetProperty(mPropertyMaxScrollPosition); + float domainSize = maxScrollPosition - minScrollPosition; + mCurrentScrollPosition = mScrollStart - mGestureDisplacement.y * domainSize / span.y; - mCurrentScrollPosition = std::min(mScrollConnector.GetMaxLimit(), std::max(mCurrentScrollPosition, mScrollConnector.GetMinLimit())); + mCurrentScrollPosition = 0.0f - std::min(maxScrollPosition, std::max(-mCurrentScrollPosition, minScrollPosition)); break; } @@ -346,12 +429,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) @@ -360,6 +443,8 @@ void ScrollBar::OnPan( PanGesture gesture ) GetImpl(itemView).DoRefresh(mCurrentScrollPosition, true); } + mPanFinishedSignal.Emit(); + break; } } @@ -372,18 +457,22 @@ 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); } } -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 ) @@ -392,7 +481,7 @@ void ScrollBar::SetIndicatorHeightPolicy( Toolkit::ScrollBar::IndicatorHeightPol ApplyConstraints(); } -Toolkit::ScrollBar::IndicatorHeightPolicy ScrollBar::GetIndicatorHeightPolicy() +Toolkit::ScrollBar::IndicatorHeightPolicy ScrollBar::GetIndicatorHeightPolicy() const { return mIndicatorHeightPolicy; } @@ -400,10 +489,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; } @@ -413,7 +506,7 @@ void ScrollBar::SetIndicatorShowDuration( float durationSeconds ) mIndicatorShowDuration = durationSeconds; } -float ScrollBar::GetIndicatorShowDuration() +float ScrollBar::GetIndicatorShowDuration() const { return mIndicatorShowDuration; } @@ -423,11 +516,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() ); @@ -452,9 +562,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 ) ) + if( 0 == strcmp( signalName.c_str(), PAN_FINISHED_SIGNAL ) ) { - scrollBar.ScrollPositionNotifiedSignal().Connect( tracker, functor ); + scrollBar.PanFinishedSignal().Connect( tracker, functor ); + } + else if( 0 == strcmp( signalName.c_str(), SCROLL_POSITION_INTERVAL_REACHED_SIGNAL ) ) + { + scrollBar.ScrollPositionIntervalReachedSignal().Connect( tracker, functor ); } else { @@ -474,6 +588,11 @@ void ScrollBar::SetProperty( BaseObject* object, Property::Index index, const Pr ScrollBar& scrollBarImpl( GetImpl( scrollBar ) ); switch( index ) { + case Toolkit::ScrollBar::Property::SCROLL_DIRECTION: + { + scrollBarImpl.OnScrollDirectionPropertySet( value ); + break; + } case Toolkit::ScrollBar::Property::INDICATOR_HEIGHT_POLICY: { scrollBarImpl.OnIndicatorHeightPolicyPropertySet( value ); @@ -494,6 +613,23 @@ void ScrollBar::SetProperty( BaseObject* object, Property::Index index, const Pr 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; + } } } } @@ -509,6 +645,11 @@ Property::Value ScrollBar::GetProperty( BaseObject* object, Property::Index inde ScrollBar& scrollBarImpl( GetImpl( scrollBar ) ); switch( index ) { + 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() ]; @@ -529,15 +670,31 @@ Property::Value ScrollBar::GetProperty( BaseObject* object, Property::Index inde 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; + } } } 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 );