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=cd3a764b239d417d77710f1f9e366da5d46b35c2;hp=55a86e29fb3965500df7bc3abceff7b906809954;hb=18088175cb55711d4675c6ea25b1b01022886be5;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..cd3a764 100755 --- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include // INTERNAL INCLUDES @@ -102,11 +103,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,21 +111,25 @@ 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::ScrollComponent, Create ); -const char* const SCROLL_POSITION_NOTIFIED_SIGNAL_NAME = "scroll-position-notified"; +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_SIGNAL_REGISTRATION( ScrollBar, "scroll-position-notified", SCROLL_POSITION_NOTIFIED_SIGNAL ) + +DALI_TYPE_REGISTRATION_END() + +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() @@ -220,9 +220,9 @@ void ScrollBar::ApplyConstraints() mIndicator.RemoveConstraint(mIndicatorPositionConstraint); } - constraint = Constraint::New( Actor::POSITION, - LocalSource( Actor::SIZE ), - ParentSource( Actor::SIZE ), + 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 ); @@ -250,6 +250,8 @@ void ScrollBar::OnScrollPositionNotified(PropertyNotification& source) void ScrollBar::Show() { + Actor self = Self(); + // Cancel any animation if(mAnimation) { @@ -260,17 +262,19 @@ void ScrollBar::Show() if(mIndicatorShowDuration > 0.0f) { mAnimation = Animation::New( mIndicatorShowDuration ); - mAnimation.OpacityTo( Self(), 1.0f, AlphaFunctions::EaseIn ); + mAnimation.AnimateTo( Property( self, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunctions::EaseIn ); mAnimation.Play(); } else { - Self().SetOpacity(1.0f); + self.SetOpacity(1.0f); } } void ScrollBar::Hide() { + Actor self = Self(); + // Cancel any animation if(mAnimation) { @@ -281,12 +285,12 @@ void ScrollBar::Hide() if(mIndicatorHideDuration > 0.0f) { mAnimation = Animation::New( mIndicatorHideDuration ); - mAnimation.OpacityTo( Self(), 0.0f, AlphaFunctions::EaseIn ); + mAnimation.AnimateTo( Property( self, Actor::Property::COLOR_ALPHA ), 0.0f, AlphaFunctions::EaseIn ); mAnimation.Play(); } else { - Self().SetOpacity(0.0f); + self.SetOpacity(0.0f); } } @@ -448,7 +452,7 @@ 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(), SCROLL_POSITION_NOTIFIED_SIGNAL ) ) { scrollBar.ScrollPositionNotifiedSignal().Connect( tracker, functor ); } @@ -470,22 +474,22 @@ 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::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; @@ -505,22 +509,22 @@ 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::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;