X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fscrollable.cpp;h=9e1c66f037ee31c9992eb6556c33b8f6c32b73b6;hb=50047908e4f93aca3d2924dd6f42f5ebdabe9967;hp=0c7ec0680263a972346bbacac542fa35336f32a3;hpb=2ddfbb9e23a7c3fc30e604236c41e0ef6d2ed6a2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/public-api/controls/scrollable/scrollable.cpp b/dali-toolkit/public-api/controls/scrollable/scrollable.cpp
index 0c7ec06..9e1c66f 100644
--- a/dali-toolkit/public-api/controls/scrollable/scrollable.cpp
+++ b/dali-toolkit/public-api/controls/scrollable/scrollable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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.
@@ -26,16 +26,6 @@ namespace Dali
 namespace Toolkit
 {
 
-const std::string Scrollable::SCROLL_RELATIVE_POSITION_PROPERTY_NAME( "scroll-relative-position" );
-const std::string Scrollable::SCROLL_POSITION_MIN_PROPERTY_NAME( "scroll-position-min" );
-const std::string Scrollable::SCROLL_POSITION_MAX_PROPERTY_NAME( "scroll-position-max" );
-const std::string Scrollable::SCROLL_DIRECTION_PROPERTY_NAME( "scroll-direction" );
-
-const char* const Scrollable::SIGNAL_SCROLL_STARTED = "scroll-started";
-const char* const Scrollable::SIGNAL_SCROLL_COMPLETED = "scroll-completed";
-const char* const Scrollable::SIGNAL_SCROLL_UPDATED = "scroll-updated";
-const char* const Scrollable::SIGNAL_SCROLL_CLAMPED = "scroll-clamped";
-
 Scrollable::Scrollable()
 {
 }
@@ -89,24 +79,14 @@ Scrollable::ScrollCompletedSignalType& Scrollable::ScrollCompletedSignal()
   return GetImpl(*this).ScrollCompletedSignal();
 }
 
-Scrollable::ScrollClampedSignalType& Scrollable::ScrollClampedSignal()
-{
-  return GetImpl(*this).ScrollClampedSignal();
-}
-
-bool Scrollable::IsScrollComponentEnabled(Scrollable::ScrollComponentType indicator) const
-{
-  return GetImpl(*this).IsScrollComponentEnabled(indicator);
-}
-
-void Scrollable::EnableScrollComponent(Scrollable::ScrollComponentType indicator)
+bool Scrollable::IsOvershootEnabled() const
 {
-  GetImpl(*this).EnableScrollComponent(indicator);
+  return GetImpl(*this).IsOvershootEnabled();
 }
 
-void Scrollable::DisableScrollComponent(Scrollable::ScrollComponentType indicator)
+void Scrollable::SetOvershootEnabled(bool enable)
 {
-  GetImpl(*this).DisableScrollComponent(indicator);
+  GetImpl(*this).SetOvershootEnabled(enable);
 }
 
 void Scrollable::SetOvershootEffectColor( const Vector4& color )