X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=base%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fscroll-bar%2Fscroll-bar.cpp;h=367e7e4a0a0e8b49199c82edba68c3b4c343b0f2;hb=774ec143481f46e4525cc7d2c30cb8f92335fc55;hp=b0279de148890244bd06a0c0f6d3027f9467d233;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp b/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp
index b0279de..367e7e4 100755
--- a/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp
+++ b/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.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/scroll-bar/scroll-bar.h>
 #include <dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h>
@@ -68,14 +69,9 @@ ScrollBar::~ScrollBar()
 {
 }
 
-void ScrollBar::SetBackgroundImage( Image image, const Vector4& border )
+void ScrollBar::SetIndicatorImage( Image image )
 {
-  GetImpl(*this).SetBackgroundImage(image, border);
-}
-
-void ScrollBar::SetIndicatorImage( Image image, const Vector4& border )
-{
-  GetImpl(*this).SetIndicatorImage(image, border);
+  GetImpl(*this).SetIndicatorImage(image);
 }
 
 Actor ScrollBar::GetScrollIndicator()
@@ -88,6 +84,46 @@ void ScrollBar::SetPositionNotifications( const std::vector<float>& positions )
   GetImpl(*this).SetPositionNotifications(positions);
 }
 
+void ScrollBar::SetIndicatorHeightPolicy( ScrollBar::IndicatorHeightPolicy policy )
+{
+  GetImpl(*this).SetIndicatorHeightPolicy(policy);
+}
+
+ScrollBar::IndicatorHeightPolicy ScrollBar::GetIndicatorHeightPolicy()
+{
+  return GetImpl(*this).GetIndicatorHeightPolicy();
+}
+
+void ScrollBar::SetIndicatorFixedHeight( float height )
+{
+  GetImpl(*this).SetIndicatorFixedHeight(height);
+}
+
+float ScrollBar::GetIndicatorFixedHeight()
+{
+  return GetImpl(*this).GetIndicatorFixedHeight();
+}
+
+void ScrollBar::SetIndicatorShowDuration( float durationSeconds )
+{
+  GetImpl(*this).SetIndicatorShowDuration(durationSeconds);
+}
+
+float ScrollBar::GetIndicatorShowDuration()
+{
+  return GetImpl(*this).GetIndicatorShowDuration();
+}
+
+void ScrollBar::SetIndicatorHideDuration( float durationSeconds )
+{
+  GetImpl(*this).SetIndicatorHideDuration(durationSeconds);
+}
+
+float ScrollBar::GetIndicatorHideDuration()
+{
+  return GetImpl(*this).GetIndicatorHideDuration();
+}
+
 void ScrollBar::Show()
 {
   GetImpl(*this).Show();