X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fscrollable.cpp;h=18ecb273edf4394493d52b6e0f61e65261ba1bdd;hp=9e708d09c76b2030cf99b999f549613746bf578e;hb=421b1cb023ab3a51842d1c7dab553e241c2301d0;hpb=e58fa784d19a558e35f458ecf6d262a2344beb4f

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scrollable.cpp b/base/dali-toolkit/public-api/controls/scrollable/scrollable.cpp
index 9e708d0..18ecb27 100644
--- a/base/dali-toolkit/public-api/controls/scrollable/scrollable.cpp
+++ b/base/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) 2014 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>
@@ -108,6 +109,26 @@ void Scrollable::DisableScrollComponent(Scrollable::ScrollComponentType indicato
   GetImpl(*this).DisableScrollComponent(indicator);
 }
 
+void Scrollable::SetOvershootEffectColor( const Vector4& color )
+{
+  GetImpl(*this).SetOvershootEffectColor(color);
+}
+
+Vector4 Scrollable::GetOvershootEffectColor() const
+{
+  return GetImpl(*this).GetOvershootEffectColor();
+}
+
+void Scrollable::SetOvershootAnimationSpeed( float pixelsPerSecond )
+{
+  GetImpl(*this).SetOvershootAnimationSpeed(pixelsPerSecond);
+}
+
+float Scrollable::GetOvershootAnimationSpeed() const
+{
+  return GetImpl(*this).GetOvershootAnimationSpeed();
+}
+
 } // namespace Toolkit
 
 } // namespace Dali