Remove the dependency between ScrollBar & ItemView

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

diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
index b506dd4..d122835 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
@@ -109,8 +109,8 @@ void Scrollable::EnableScrollComponent(Toolkit::Scrollable::ScrollComponentType
   {
     // Create ScrollComponent
     Toolkit::Scrollable scrollable = Toolkit::Scrollable::DownCast(Self());
-    Toolkit::ScrollComponent scrollComponent = ScrollComponent::New(scrollable, type);
-    Toolkit::Internal::ScrollComponent& component = static_cast<Toolkit::Internal::ScrollComponent&>(scrollComponent.GetImplementation());
+    Toolkit::ScrollComponent scrollComponent = NewScrollComponent(scrollable, type);
+    Toolkit::ScrollComponentImpl& component = static_cast<Toolkit::ScrollComponentImpl&>(scrollComponent.GetImplementation());
     ScrollComponentPtr componentPtr(&component);
 
     mComponents[type] = componentPtr;
@@ -131,9 +131,6 @@ void Scrollable::DisableScrollComponent(Toolkit::Scrollable::ScrollComponentType
   {
     ScrollComponentPtr component = pair->second;
 
-    // Disconnect the scroll component first.
-    component->OnDisconnect();
-
     // Destroy ScrollComponent.
     mComponents.erase( type );
   }
@@ -191,6 +188,31 @@ bool Scrollable::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface
   return connected;
 }
 
+Toolkit::ScrollComponent Scrollable::NewScrollComponent(Toolkit::Scrollable& scrollable, Toolkit::Scrollable::ScrollComponentType type)
+{
+  Toolkit::ScrollComponent instance;
+
+  switch(type)
+  {
+    case Toolkit::Scrollable::VerticalScrollBar:
+    {
+      instance = static_cast<Toolkit::ScrollComponent>(Toolkit::ScrollBarInternal::New(scrollable, true));
+      break;
+    }
+    case Toolkit::Scrollable::HorizontalScrollBar:
+    {
+      instance = static_cast<Toolkit::ScrollComponent>(Toolkit::ScrollBarInternal::New(scrollable, false));
+      break;
+    }
+    default:
+    {
+      DALI_ASSERT_ALWAYS(true && "Unrecognized component type");
+    }
+  }
+
+  return instance;
+}
+
 } // namespace Internal
 
 } // namespace Toolkit