X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fscrollable.cpp;h=9e1c66f037ee31c9992eb6556c33b8f6c32b73b6;hb=1e22ba4d5effd6ee0de1147f5c35a5211de87289;hp=9e708d09c76b2030cf99b999f549613746bf578e;hpb=e2eda444afbe82e9591fe198eef339227f90a616;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 9e708d0..9e1c66f 100644
--- a/dali-toolkit/public-api/controls/scrollable/scrollable.cpp
+++ b/dali-toolkit/public-api/controls/scrollable/scrollable.cpp
@@ -1,18 +1,19 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 #include <dali-toolkit/internal/controls/scrollable/scrollable-impl.h>
@@ -25,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()
 {
 }
@@ -73,39 +64,49 @@ Scrollable Scrollable::DownCast( BaseHandle handle )
   return Control::DownCast<Scrollable, Internal::Scrollable>(handle);
 }
 
-Scrollable::ScrollStartedSignalV2& Scrollable::ScrollStartedSignal()
+Scrollable::ScrollStartedSignalType& Scrollable::ScrollStartedSignal()
 {
   return GetImpl(*this).ScrollStartedSignal();
 }
 
-Scrollable::ScrollUpdatedSignalV2& Scrollable::ScrollUpdatedSignal()
+Scrollable::ScrollUpdatedSignalType& Scrollable::ScrollUpdatedSignal()
 {
   return GetImpl(*this).ScrollUpdatedSignal();
 }
 
-Scrollable::ScrollCompletedSignalV2& Scrollable::ScrollCompletedSignal()
+Scrollable::ScrollCompletedSignalType& Scrollable::ScrollCompletedSignal()
 {
   return GetImpl(*this).ScrollCompletedSignal();
 }
 
-Scrollable::ScrollClampedSignalV2& Scrollable::ScrollClampedSignal()
+bool Scrollable::IsOvershootEnabled() const
+{
+  return GetImpl(*this).IsOvershootEnabled();
+}
+
+void Scrollable::SetOvershootEnabled(bool enable)
+{
+  GetImpl(*this).SetOvershootEnabled(enable);
+}
+
+void Scrollable::SetOvershootEffectColor( const Vector4& color )
 {
-  return GetImpl(*this).ScrollClampedSignal();
+  GetImpl(*this).SetOvershootEffectColor(color);
 }
 
-bool Scrollable::IsScrollComponentEnabled(Scrollable::ScrollComponentType indicator) const
+Vector4 Scrollable::GetOvershootEffectColor() const
 {
-  return GetImpl(*this).IsScrollComponentEnabled(indicator);
+  return GetImpl(*this).GetOvershootEffectColor();
 }
 
-void Scrollable::EnableScrollComponent(Scrollable::ScrollComponentType indicator)
+void Scrollable::SetOvershootAnimationSpeed( float pixelsPerSecond )
 {
-  GetImpl(*this).EnableScrollComponent(indicator);
+  GetImpl(*this).SetOvershootAnimationSpeed(pixelsPerSecond);
 }
 
-void Scrollable::DisableScrollComponent(Scrollable::ScrollComponentType indicator)
+float Scrollable::GetOvershootAnimationSpeed() const
 {
-  GetImpl(*this).DisableScrollComponent(indicator);
+  return GetImpl(*this).GetOvershootAnimationSpeed();
 }
 
 } // namespace Toolkit