Cancelled signal is triggered to reset status when gesture is detached.

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / scrollable / scroll-connector-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp
index 7983fa5..a001f0c 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scroll-connector-impl.cpp
@@ -29,28 +29,32 @@ namespace Toolkit
 namespace Internal
 {
 
-const Property::Index ScrollConnector::SCROLL_POSITION = 50000000; // TODO - expose CUSTOM_PROPERTY_START from Core
+const Property::Index ScrollConnector::SCROLL_POSITION = Dali::PROPERTY_CUSTOM_START_INDEX;
+const Property::Index ScrollConnector::OVERSHOOT       = Dali::PROPERTY_CUSTOM_START_INDEX + 1;
 
 ScrollConnector* ScrollConnector::New()
 {
   return new ScrollConnector();
 }
 
-void ScrollConnector::SetLimits( float min, float max )
+void ScrollConnector::SetScrollDomain( float min, float max, float length )
 {
   mMinLimit = min;
   mMaxLimit = max;
+  mContentLength = length;
 
-  mLimitsChangedSignal.Emit( mMinLimit, mMaxLimit );
+  mDomainChangedSignal.Emit( mMinLimit, mMaxLimit, mContentLength );
 }
 
 ScrollConnector::ScrollConnector()
 : mMinLimit( 0.0f ),
-  mMaxLimit( 0.0f )
+  mMaxLimit( 0.0f ),
+  mContentLength( 0.0f )
 {
   mScrollPositionObject = Constrainable::New();
 
   mScrollPositionObject.RegisterProperty( Toolkit::ScrollConnector::SCROLL_POSITION_PROPERTY_NAME, 0.0f );
+  mScrollPositionObject.RegisterProperty( Toolkit::ScrollConnector::OVERSHOOT_PROPERTY_NAME, 0.0f );
 }
 
 ScrollConnector::~ScrollConnector()