Remove the dependency between ScrollBar & ItemView

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

diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
index f9473b9..7ae50af 100755 (executable)
--- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
+++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
@@ -126,8 +126,7 @@ TypeRegistration mType( typeid(Toolkit::ScrollBar), typeid(Toolkit::Control), Cr
 }
 
 ScrollBar::ScrollBar()
-: ControlImpl(true/*requires touch*/),
-  mScrollStart(0.0f)
+: mScrollStart(0.0f)
 {
 }
 
@@ -153,18 +152,22 @@ void ScrollBar::OnInitialize()
   EnableGestureDetection(Gesture::Type(Gesture::Pan));
 }
 
-void ScrollBar::SetScrollConnector( Toolkit::ScrollConnector connector )
+void ScrollBar::OnScrollConnectorSet( Toolkit::ScrollConnector oldConnector )
 {
-  if(mScrollConnector)
+  if( oldConnector )
   {
-    mScrollConnector.DomainChangedSignal().Disconnect(this, &ScrollBar::OnScrollDomainChanged);
+    oldConnector.DomainChangedSignal().Disconnect(this, &ScrollBar::OnScrollDomainChanged);
+
+    mScrollPositionObject.Reset();
   }
 
-  mScrollConnector = connector;
-  mScrollPositionObject = mScrollConnector.GetScrollPositionObject();
+  if( mScrollConnector )
+  {
+    mScrollPositionObject = mScrollConnector.GetScrollPositionObject();
 
-  ApplyConstraints();
-  mScrollConnector.DomainChangedSignal().Connect(this, &ScrollBar::OnScrollDomainChanged);
+    ApplyConstraints();
+    mScrollConnector.DomainChangedSignal().Connect(this, &ScrollBar::OnScrollDomainChanged);
+  }
 }
 
 void ScrollBar::SetBackgroundImage( Image image, const Vector4& border )