Merge "Usage of CustomeView for ScrollContainer and code refactoring accordingly...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / visual-factory / visual-base.cpp

diff --git a/dali-toolkit/devel-api/visual-factory/visual-base.cpp b/dali-toolkit/devel-api/visual-factory/visual-base.cpp
index 52f7f3e..790a3e7 100644 (file)
--- a/dali-toolkit/devel-api/visual-factory/visual-base.cpp
+++ b/dali-toolkit/devel-api/visual-factory/visual-base.cpp
@@ -51,14 +51,19 @@ Visual::Base::Base(Internal::Visual::Base *impl)
 {
 }
 
-void Visual::Base::SetSize( const Vector2& size )
+void Visual::Base::SetName( const std::string& name )
 {
-  GetImplementation( *this ).SetSize( size );
+  GetImplementation( *this ).SetName( name );
 }
 
-const Vector2& Visual::Base::GetSize() const
+const std::string& Visual::Base::GetName()
 {
-  return GetImplementation( *this ).GetSize();
+  return GetImplementation( *this ).GetName();
+}
+
+void Visual::Base::SetTransformAndSize( const Property::Map& transform, Size controlSize )
+{
+  GetImplementation( *this ).SetTransformAndSize( transform, controlSize );
 }
 
 float Visual::Base::GetHeightForWidth( float width ) const
@@ -66,7 +71,7 @@ float Visual::Base::GetHeightForWidth( float width ) const
   return GetImplementation( *this ).GetHeightForWidth( width );
 }
 
-void Visual::Base::GetNaturalSize(Vector2& naturalSize ) const
+void Visual::Base::GetNaturalSize(Vector2& naturalSize )
 {
   GetImplementation( *this ).GetNaturalSize( naturalSize );
 }
@@ -81,25 +86,6 @@ float Visual::Base::GetDepthIndex() const
   return GetImplementation( *this ).GetDepthIndex();
 }
 
-void Visual::Base::SetOnStage( Actor& actor )
-{
-  GetImplementation( *this ).SetOnStage( actor );
-}
-
-void Visual::Base::SetOffStage( Actor& actor )
-{
-  GetImplementation( *this ).SetOffStage( actor );
-}
-
-void Visual::Base::RemoveAndReset( Actor& actor )
-{
-  if( actor && *this )
-  {
-    SetOffStage( actor );
-  }
-  Reset();
-}
-
 void Visual::Base::CreatePropertyMap( Property::Map& map ) const
 {
   GetImplementation( *this ).CreatePropertyMap( map );