X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscrollable-impl.cpp;h=6cd2e67131f4427e16d424104aa8abd0e20a6559;hp=20da41c559d1b075100821a5470fcc02a5b94cfe;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=84e05cec3039abe8ecaaa950d4f93dd4f94282fe diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp index 20da41c..6cd2e67 100644 --- a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp @@ -86,6 +86,9 @@ Scrollable::Scrollable() mOvershootAnimationSpeed ( DEFAULT_OVERSHOOT_ANIMATION_SPEED ), mOvershootSize( OVERSHOOT_DEFAULT_SIZE ), mScrollToAlphaFunction( AlphaFunction::EASE_OUT ), + mScrollStartedSignal(), + mScrollUpdatedSignal(), + mScrollCompletedSignal(), mOvershootEnabled(true) { } @@ -96,6 +99,9 @@ Scrollable::Scrollable( ControlBehaviour behaviourFlags ) mOvershootAnimationSpeed ( DEFAULT_OVERSHOOT_ANIMATION_SPEED ), mOvershootSize( OVERSHOOT_DEFAULT_SIZE ), mScrollToAlphaFunction( AlphaFunction::EASE_OUT ), + mScrollStartedSignal(), + mScrollUpdatedSignal(), + mScrollCompletedSignal(), mOvershootEnabled(true) { } @@ -204,12 +210,7 @@ void Scrollable::SetProperty( BaseObject* object, Property::Index index, const P } case Toolkit::Scrollable::Property::OVERSHOOT_SIZE: { - Vector2 input; - if( value.Get( input ) ) - { - scrollableImpl.mOvershootSize = input; - } - scrollableImpl.EnableScrollOvershoot( scrollableImpl.IsOvershootEnabled() ); + scrollableImpl.SetOvershootSize( value.Get() ); break; } case Toolkit::Scrollable::Property::SCROLL_TO_ALPHA_FUNCTION: