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=87d31f80189df90d9d25727ad48359eeb8190b04;hp=64fa2b9be6ec4d7b1fe0ca547dcbb886141cce4e;hb=79182b18eabe71f0ffa2779f0ad17a859f855b9a;hpb=1c3cb32385174b852b8d57b531625f733238f664 diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp index 64fa2b9..87d31f8 100644 --- a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp @@ -51,7 +51,6 @@ const float DEFAULT_OVERSHOOT_ANIMATION_SPEED(120.0f); // 120 pixels per second const char* const SIGNAL_SCROLL_STARTED = "scroll-started"; const char* const SIGNAL_SCROLL_COMPLETED = "scroll-completed"; const char* const SIGNAL_SCROLL_UPDATED = "scroll-updated"; -const char* const SIGNAL_SCROLL_CLAMPED = "scroll-clamped"; BaseHandle Create() { @@ -64,7 +63,6 @@ TypeRegistration mType( typeid( Toolkit::Scrollable ), typeid( Toolkit::Control SignalConnectorType s1( mType, SIGNAL_SCROLL_STARTED, &Scrollable::DoConnectSignal ); SignalConnectorType s2( mType, SIGNAL_SCROLL_COMPLETED, &Scrollable::DoConnectSignal ); SignalConnectorType s3( mType, SIGNAL_SCROLL_UPDATED, &Scrollable::DoConnectSignal ); -SignalConnectorType s4( mType, SIGNAL_SCROLL_CLAMPED, &Scrollable::DoConnectSignal ); PropertyRegistration property1( mType, "overshoot-effect-color", @@ -211,11 +209,6 @@ Toolkit::Scrollable::ScrollCompletedSignalType& Scrollable::ScrollCompletedSigna return mScrollCompletedSignal; } -Toolkit::Scrollable::ScrollClampedSignalType& Scrollable::ScrollClampedSignal() -{ - return mScrollClampedSignal; -} - bool Scrollable::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) { Dali::BaseHandle handle( object ); @@ -235,10 +228,6 @@ bool Scrollable::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface { scrollable.ScrollCompletedSignal().Connect( tracker, functor ); } - else if( 0 == strcmp( signalName.c_str(), SIGNAL_SCROLL_CLAMPED ) ) - { - scrollable.ScrollClampedSignal().Connect( tracker, functor ); - } else { // signalName does not match any signal