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=c5884879e995c08c5f983175b6997e175ed60e3f;hp=74450aeaec541e264f09d0dbfebbde85a094a420;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=f6cf60941d7fb0f8a746ac7c526be305fc2a5961 diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp old mode 100755 new mode 100644 index 74450ae..c588487 --- 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) 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. @@ -22,29 +22,33 @@ #include // for strcmp #include #include -#include #include #include -#include +#include #include - +#include +#include // INTERNAL INCLUDES +#include #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_FILE_NAME = "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); +const float DEFAULT_INDICATOR_TRANSIENT_DURATION(1.0f); /** * Indicator size constraint @@ -52,7 +56,13 @@ const float DEFAULT_INDICATOR_FIXED_HEIGHT(80.0f); */ struct IndicatorSizeConstraint { - IndicatorSizeConstraint() + /** + * @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 ) { } @@ -62,17 +72,23 @@ struct IndicatorSizeConstraint * @param[in] parentSizeProperty The parent size of scroll indicator. * @return The new scroll indicator size. */ - void operator()(Vector3& current, const PropertyInputContainer& inputs ) + 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); + // 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(MINIMUM_INDICATOR_HEIGHT, height); + current.y = std::max( mMinimumHeight, height ); } + + float mMinimumHeight; + float mPadding; }; /** @@ -82,10 +98,12 @@ struct IndicatorSizeConstraint 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() + IndicatorPositionConstraint( float startPadding, float endPadding ) + : mStartPadding( startPadding ), + mEndPadding( endPadding ) { } @@ -100,13 +118,19 @@ struct IndicatorPositionConstraint 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(); + const float minimumScrollPosition = inputs[3]->GetFloat(); + const float maximumScrollPosition = inputs[4]->GetFloat(); - float relativePosition = std::max( 0.0f, std::min( 1.0f, (scrollPosition - minScrollPosition) / (maxScrollPosition - minScrollPosition) ) ); - current.y = ( parentSize.height - indicatorSize.height ) * relativePosition; + // 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 mStartPadding; + float mEndPadding; }; } // unnamed namespace @@ -133,38 +157,53 @@ BaseHandle Create() // Setup properties, signals and actions using the type-registry. DALI_TYPE_REGISTRATION_BEGIN( Toolkit::ScrollBar, Toolkit::Control, Create ); -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_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_PROPERTY_REGISTRATION( Toolkit, ScrollBar, "indicatorTransientDuration", FLOAT, INDICATOR_TRANSIENT_DURATION ) + +DALI_SIGNAL_REGISTRATION( Toolkit, ScrollBar, "panFinished", PAN_FINISHED_SIGNAL ) +DALI_SIGNAL_REGISTRATION( Toolkit, ScrollBar, "scrollPositionIntervalReached", SCROLL_POSITION_INTERVAL_REACHED_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_ACTION_REGISTRATION( Toolkit, ScrollBar, "ShowIndicator", ACTION_SHOW_INDICATOR ) +DALI_ACTION_REGISTRATION( Toolkit, ScrollBar, "HideIndicator", ACTION_HIDE_INDICATOR ) +DALI_ACTION_REGISTRATION( Toolkit, ScrollBar, "ShowTransientIndicator", ACTION_SHOW_TRANSIENT_INDICATOR ) DALI_TYPE_REGISTRATION_END() -const char* SCROLL_DIRECTION_NAME[] = {"Vertical", "Horizontal"}; -const char* INDICATOR_HEIGHT_POLICY_NAME[] = {"Variable", "Fixed"}; +const char* SCROLL_DIRECTION_NAME[] = {"VERTICAL", "HORIZONTAL"}; +const char* INDICATOR_HEIGHT_POLICY_NAME[] = {"VARIABLE", "FIXED"}; } ScrollBar::ScrollBar(Toolkit::ScrollBar::Direction direction) -: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ), +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), + mIndicatorShowAlpha(1.0f), mDirection(direction), - mScrollableObject(WeakHandleBase()), + mScrollableObject(WeakHandle()), 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), + mTransientIndicatorDuration(DEFAULT_INDICATOR_TRANSIENT_DURATION), mScrollStart(0.0f), - mIsPanning(false), + mGestureDisplacement( Vector2::ZERO ), mCurrentScrollPosition(0.0f), - mIndicatorHeightPolicy(Toolkit::ScrollBar::Variable), - mIndicatorFixedHeight(DEFAULT_INDICATOR_FIXED_HEIGHT) + mIndicatorHeightPolicy(Toolkit::ScrollBar::VARIABLE), + mIndicatorFixedHeight(DEFAULT_INDICATOR_FIXED_HEIGHT), + mIndicatorMinimumHeight(DEFAULT_INDICATOR_MINIMUM_HEIGHT), + mIndicatorStartPadding(DEFAULT_INDICATOR_START_PADDING), + mIndicatorEndPadding(DEFAULT_INDICATOR_END_PADDING), + mIsPanning(false), + mIndicatorFirstShow(true) { } @@ -175,7 +214,7 @@ ScrollBar::~ScrollBar() void ScrollBar::OnInitialize() { CreateDefaultIndicatorActor(); - Self().SetDrawMode(DrawMode::OVERLAY_2D); + Self().SetProperty( Actor::Property::DRAW_MODE,DrawMode::OVERLAY_2D); } void ScrollBar::SetScrollPropertySource( Handle handle, Property::Index propertyScrollPosition, Property::Index propertyMinScrollPosition, Property::Index propertyMaxScrollPosition, Property::Index propertyScrollContentSize ) @@ -186,7 +225,7 @@ void ScrollBar::SetScrollPropertySource( Handle handle, Property::Index property && propertyMaxScrollPosition != Property::INVALID_INDEX && propertyScrollContentSize != Property::INVALID_INDEX ) { - mScrollableObject = WeakHandleBase(handle); + mScrollableObject = WeakHandle(handle); mPropertyScrollPosition = propertyScrollPosition; mPropertyMinScrollPosition = propertyMinScrollPosition; mPropertyMaxScrollPosition = propertyMaxScrollPosition; @@ -202,13 +241,12 @@ void ScrollBar::SetScrollPropertySource( Handle handle, Property::Index property void ScrollBar::CreateDefaultIndicatorActor() { - 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 ); - + const std::string imageDirPath = AssetManager::GetDaliImagePath(); + Toolkit::ImageView indicator = Toolkit::ImageView::New( imageDirPath + DEFAULT_INDICATOR_IMAGE_FILE_NAME ); + indicator.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + indicator.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + indicator.SetStyleName( "ScrollBarIndicator" ); + indicator.SetProperty( Actor::Property::COLOR_MODE, USE_OWN_MULTIPLY_PARENT_COLOR ); SetScrollIndicator(indicator); } @@ -217,10 +255,17 @@ void ScrollBar::SetScrollIndicator( Actor indicator ) // Don't allow empty handle if( indicator ) { + // Remove current Indicator + if( mIndicator ) + { + Self().Remove( mIndicator ); + } mIndicator = indicator; - Self().Add(mIndicator); - EnableGestureDetection(Gesture::Type(Gesture::Pan)); + mIndicatorFirstShow = true; + Self().Add( mIndicator ); + + EnableGestureDetection( Gesture::Type( Gesture::Pan ) ); PanGestureDetector detector( GetPanGestureDetector() ); detector.DetachAll(); @@ -249,7 +294,7 @@ Actor ScrollBar::GetScrollIndicator() void ScrollBar::ApplyConstraints() { - Handle scrollableHandle = mScrollableObject.GetBaseHandle(); + Handle scrollableHandle = mScrollableObject.GetHandle(); if( scrollableHandle ) { @@ -259,13 +304,14 @@ void ScrollBar::ApplyConstraints() } // Set indicator height according to the indicator's height policy - if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed) + if(mIndicatorHeightPolicy == Toolkit::ScrollBar::FIXED) { - mIndicator.SetSize(Self().GetCurrentSize().width, mIndicatorFixedHeight); + mIndicator.SetProperty( Actor::Property::SIZE, Vector2( Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, mIndicatorFixedHeight) ); } else { - mIndicatorSizeConstraint = Constraint::New( mIndicator, Actor::Property::SIZE, IndicatorSizeConstraint() ); + mIndicatorSizeConstraint = Constraint::New( mIndicator, Actor::Property::SIZE, + IndicatorSizeConstraint( mIndicatorMinimumHeight, mIndicatorStartPadding + mIndicatorEndPadding ) ); mIndicatorSizeConstraint.AddSource( ParentSource( Actor::Property::SIZE ) ); mIndicatorSizeConstraint.AddSource( Source( scrollableHandle, mPropertyScrollContentSize ) ); mIndicatorSizeConstraint.Apply(); @@ -276,7 +322,8 @@ void ScrollBar::ApplyConstraints() mIndicatorPositionConstraint.Remove(); } - mIndicatorPositionConstraint = Constraint::New( mIndicator, Actor::Property::POSITION, IndicatorPositionConstraint() ); + 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 ) ); @@ -290,7 +337,7 @@ void ScrollBar::SetScrollPositionIntervals( const Dali::Vector& positions { mScrollPositionIntervals = positions; - Handle scrollableHandle = mScrollableObject.GetBaseHandle(); + Handle scrollableHandle = mScrollableObject.GetHandle(); if( scrollableHandle ) { @@ -312,10 +359,10 @@ Dali::Vector ScrollBar::GetScrollPositionIntervals() const void ScrollBar::OnScrollPositionIntervalReached(PropertyNotification& source) { // Emit the signal to notify the scroll position crossing - Handle scrollableHandle = mScrollableObject.GetBaseHandle(); + Handle scrollableHandle = mScrollableObject.GetHandle(); if(scrollableHandle) { - mScrollPositionIntervalReachedSignal.Emit(scrollableHandle.GetProperty(mPropertyScrollPosition)); + mScrollPositionIntervalReachedSignal.Emit( scrollableHandle.GetCurrentProperty< float >( mPropertyScrollPosition ) ); } } @@ -328,15 +375,22 @@ void ScrollBar::ShowIndicator() mAnimation.Reset(); } + if( mIndicatorFirstShow ) + { + // Preserve the alpha value from the stylesheet + mIndicatorShowAlpha = Self().GetCurrentProperty< Vector4 >( Actor::Property::COLOR ).a; + mIndicatorFirstShow = false; + } + if(mIndicatorShowDuration > 0.0f) { mAnimation = Animation::New( mIndicatorShowDuration ); - mAnimation.AnimateTo( Property( mIndicator, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunction::EASE_IN ); + mAnimation.AnimateTo( Property( mIndicator, Actor::Property::COLOR_ALPHA ), mIndicatorShowAlpha, AlphaFunction::EASE_IN ); mAnimation.Play(); } else { - mIndicator.SetOpacity(1.0f); + mIndicator.SetProperty( Actor::Property::OPACITY,mIndicatorShowAlpha); } } @@ -357,14 +411,38 @@ void ScrollBar::HideIndicator() } else { - mIndicator.SetOpacity(0.0f); + mIndicator.SetProperty( Actor::Property::OPACITY,0.0f); } } +void ScrollBar::ShowTransientIndicator() +{ + // Cancel any animation + if(mAnimation) + { + mAnimation.Clear(); + mAnimation.Reset(); + } + + mAnimation = Animation::New( mIndicatorShowDuration + mTransientIndicatorDuration + mIndicatorHideDuration ); + if(mIndicatorShowDuration > 0.0f) + { + mAnimation.AnimateTo( Property( mIndicator, Actor::Property::COLOR_ALPHA ), + mIndicatorShowAlpha, AlphaFunction::EASE_IN, TimePeriod(0, mIndicatorShowDuration) ); + } + else + { + mIndicator.SetProperty( Actor::Property::OPACITY,mIndicatorShowAlpha); + } + mAnimation.AnimateTo( Property( mIndicator, Actor::Property::COLOR_ALPHA ), + 0.0f, AlphaFunction::EASE_IN, TimePeriod((mIndicatorShowDuration + mTransientIndicatorDuration), mIndicatorHideDuration) ); + mAnimation.Play(); +} + bool ScrollBar::OnPanGestureProcessTick() { // Update the scroll position property. - Handle scrollableHandle = mScrollableObject.GetBaseHandle(); + Handle scrollableHandle = mScrollableObject.GetHandle(); if( scrollableHandle ) { scrollableHandle.SetProperty(mPropertyScrollPosition, mCurrentScrollPosition); @@ -375,15 +453,15 @@ bool ScrollBar::OnPanGestureProcessTick() void ScrollBar::OnPan( const PanGesture& gesture ) { - Handle scrollableHandle = mScrollableObject.GetBaseHandle(); + Handle scrollableHandle = mScrollableObject.GetHandle(); if(scrollableHandle) { Dali::Toolkit::ItemView itemView = Dali::Toolkit::ItemView::DownCast(scrollableHandle); - switch(gesture.state) + switch(gesture.GetState()) { - case Gesture::Started: + case Dali::Gesture::Started: { if( !mPanProcessTimer ) { @@ -394,24 +472,25 @@ void ScrollBar::OnPan( const PanGesture& gesture ) } ShowIndicator(); - mScrollStart = scrollableHandle.GetProperty(mPropertyScrollPosition); - mGestureDisplacement = Vector3::ZERO; + mScrollStart = scrollableHandle.GetCurrentProperty< float >( mPropertyScrollPosition ); + mGestureDisplacement = Vector2::ZERO; mIsPanning = true; break; } - case Gesture::Continuing: + case Dali::Gesture::Continuing: { - Vector3 delta(gesture.displacement.x, gesture.displacement.y, 0.0f); - mGestureDisplacement+=delta; + mGestureDisplacement += gesture.GetDisplacement(); - Vector3 span = Self().GetCurrentSize() - mIndicator.GetCurrentSize(); - float minScrollPosition = scrollableHandle.GetProperty(mPropertyMinScrollPosition); - float maxScrollPosition = scrollableHandle.GetProperty(mPropertyMaxScrollPosition); + float minScrollPosition = scrollableHandle.GetCurrentProperty( mPropertyMinScrollPosition ); + float maxScrollPosition = scrollableHandle.GetCurrentProperty( mPropertyMaxScrollPosition ); + + // The domain size is the internal range float domainSize = maxScrollPosition - minScrollPosition; + float logicalSize = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y - ( mIndicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y + mIndicatorStartPadding + mIndicatorEndPadding ); - mCurrentScrollPosition = mScrollStart - mGestureDisplacement.y * domainSize / span.y; - mCurrentScrollPosition = 0.0f - std::min(maxScrollPosition, std::max(-mCurrentScrollPosition, minScrollPosition)); + mCurrentScrollPosition = mScrollStart - ( ( mGestureDisplacement.y * domainSize ) / logicalSize ); + mCurrentScrollPosition = -std::min( maxScrollPosition, std::max( -mCurrentScrollPosition, minScrollPosition ) ); break; } @@ -449,10 +528,12 @@ void ScrollBar::OnPan( const PanGesture& gesture ) void ScrollBar::OnSizeSet( const Vector3& size ) { - if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed) + if(mIndicatorHeightPolicy == Toolkit::ScrollBar::FIXED) { - mIndicator.SetSize(size.width, mIndicatorFixedHeight); + mIndicator.SetProperty( Actor::Property::SIZE, Vector2( size.width, mIndicatorFixedHeight ) ); } + + Control::OnSizeSet( size ); } void ScrollBar::SetScrollDirection( Toolkit::ScrollBar::Direction direction ) @@ -467,8 +548,11 @@ Toolkit::ScrollBar::Direction ScrollBar::GetScrollDirection() const void ScrollBar::SetIndicatorHeightPolicy( Toolkit::ScrollBar::IndicatorHeightPolicy policy ) { - mIndicatorHeightPolicy = policy; - ApplyConstraints(); + if( policy != mIndicatorHeightPolicy ) + { + mIndicatorHeightPolicy = policy; + ApplyConstraints(); + } } Toolkit::ScrollBar::IndicatorHeightPolicy ScrollBar::GetIndicatorHeightPolicy() const @@ -480,9 +564,9 @@ void ScrollBar::SetIndicatorFixedHeight( float height ) { mIndicatorFixedHeight = height; - if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed) + if(mIndicatorHeightPolicy == Toolkit::ScrollBar::FIXED) { - mIndicator.SetSize(Self().GetCurrentSize().width, mIndicatorFixedHeight); + mIndicator.SetProperty( Actor::Property::SIZE, Vector2( Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, mIndicatorFixedHeight) ); } } @@ -514,13 +598,13 @@ float ScrollBar::GetIndicatorHideDuration() const void ScrollBar::OnScrollDirectionPropertySet( Property::Value propertyValue ) { std::string directionName( propertyValue.Get() ); - if(directionName == "Vertical") + if(directionName == "VERTICAL") { - SetScrollDirection(Toolkit::ScrollBar::Vertical); + SetScrollDirection(Toolkit::ScrollBar::VERTICAL); } - else if(directionName == "Horizontal") + else if(directionName == "HORIZONTAL") { - SetScrollDirection(Toolkit::ScrollBar::Horizontal); + SetScrollDirection(Toolkit::ScrollBar::HORIZONTAL); } else { @@ -531,13 +615,13 @@ void ScrollBar::OnScrollDirectionPropertySet( Property::Value propertyValue ) void ScrollBar::OnIndicatorHeightPolicyPropertySet( Property::Value propertyValue ) { std::string policyName( propertyValue.Get() ); - if(policyName == "Variable") + if(policyName == "VARIABLE") { - SetIndicatorHeightPolicy(Toolkit::ScrollBar::Variable); + SetIndicatorHeightPolicy(Toolkit::ScrollBar::VARIABLE); } - else if(policyName == "Fixed") + else if(policyName == "FIXED") { - SetIndicatorHeightPolicy(Toolkit::ScrollBar::Fixed); + SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED); } else { @@ -620,6 +704,29 @@ void ScrollBar::SetProperty( BaseObject* object, Property::Index index, const Pr } 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; + } + case Toolkit::ScrollBar::Property::INDICATOR_TRANSIENT_DURATION: + { + scrollBarImpl.mTransientIndicatorDuration = value.Get(); + break; + } } } } @@ -662,21 +769,80 @@ Property::Value ScrollBar::GetProperty( BaseObject* object, Property::Index inde } case Toolkit::ScrollBar::Property::SCROLL_POSITION_INTERVALS: { - Property::Value value( Property::ARRAY ); - Property::Array* array = value.GetArray(); - Dali::Vector positions = scrollBarImpl.GetScrollPositionIntervals(); - size_t positionCount( array->Count() ); - for( size_t i( 0 ); i != positionCount; ++i ) + Property::Value tempValue( Property::ARRAY ); + Property::Array* array = tempValue.GetArray(); + + if( array ) { - array->PushBack( positions[i] ); + Dali::Vector positions = scrollBarImpl.GetScrollPositionIntervals(); + size_t positionCount( positions.Count() ); + + for( size_t i( 0 ); i != positionCount; ++i ) + { + array->PushBack( positions[i] ); + } + + value = tempValue; } 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; + } + case Toolkit::ScrollBar::Property::INDICATOR_TRANSIENT_DURATION: + { + value = scrollBarImpl.mTransientIndicatorDuration; + break; + } } } return value; } +bool ScrollBar::DoAction( BaseObject* object, const std::string& actionName, const Property::Map& attributes ) +{ + bool ret = false; + + Dali::BaseHandle handle( object ); + + Toolkit::ScrollBar scrollBar = Toolkit::ScrollBar::DownCast( handle ); + + DALI_ASSERT_DEBUG( scrollBar ); + + if( scrollBar ) + { + if( 0 == strcmp( actionName.c_str(), ACTION_SHOW_INDICATOR ) ) + { + GetImpl( scrollBar ).ShowIndicator(); + ret = true; + } + else if( 0 == strcmp( actionName.c_str(), ACTION_HIDE_INDICATOR ) ) + { + GetImpl( scrollBar ).HideIndicator(); + ret = true; + } + else if( 0 == strcmp( actionName.c_str(), ACTION_SHOW_TRANSIENT_INDICATOR ) ) + { + GetImpl( scrollBar ).ShowTransientIndicator(); + ret = true; + } + } + + return ret; +} + Toolkit::ScrollBar ScrollBar::New(Toolkit::ScrollBar::Direction direction) { // Create the implementation, temporarily owned by this handle on stack