Merge "DALi Version 1.2.48" into devel/master

[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 0b3193f..b6a51fb 100644 (file)
--- a/dali-toolkit/devel-api/visual-factory/visual-base.cpp
+++ b/dali-toolkit/devel-api/visual-factory/visual-base.cpp
@@ -1,5 +1,5 @@
  /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -27,83 +27,77 @@ namespace Dali
 namespace Toolkit
 {
 
-namespace Visual
-{
-
-Base::Base()
+Visual::Base::Base()
 {
 }
 
-Base::~Base()
+Visual::Base::~Base()
 {
 }
 
-Base::Base( const Base& handle )
+Visual::Base::Base( const Visual::Base& handle )
 : BaseHandle( handle )
 {
 }
 
-Base& Base::operator=( const Base& handle )
+Visual::Base& Visual::Base::operator=( const Visual::Base& handle )
 {
   BaseHandle::operator=( handle );
   return *this;
 }
 
-Base::Base(Internal::Visual::Base *impl)
+Visual::Base::Base(Internal::Visual::Base *impl)
 : BaseHandle( impl )
 {
 }
 
-void Base::SetSize( const Vector2& size )
+void Visual::Base::SetName( const std::string& name )
 {
-  GetImplementation( *this ).SetSize( size );
+  GetImplementation( *this ).SetName( name );
 }
 
-const Vector2& Base::GetSize() const
+const std::string& Visual::Base::GetName()
 {
-  return GetImplementation( *this ).GetSize();
+  return GetImplementation( *this ).GetName();
 }
 
-void Base::GetNaturalSize(Vector2& naturalSize ) const
+void Visual::Base::SetTransformAndSize( const Property::Map& transform, Size controlSize )
 {
-  GetImplementation( *this ).GetNaturalSize( naturalSize );
+  GetImplementation( *this ).SetTransformAndSize( transform, controlSize );
 }
 
-void Base::SetDepthIndex( float index )
+float Visual::Base::GetHeightForWidth( float width )
 {
-  GetImplementation( *this ).SetDepthIndex( index );
+  return GetImplementation( *this ).GetHeightForWidth( width );
 }
 
-float Base::GetDepthIndex() const
+float Visual::Base::GetWidthForHeight( float height )
 {
-  return GetImplementation( *this ).GetDepthIndex();
+  return GetImplementation( *this ).GetWidthForHeight( height );
 }
 
-void Base::SetOnStage( Actor& actor )
+void Visual::Base::GetNaturalSize(Vector2& naturalSize )
 {
-  GetImplementation( *this ).SetOnStage( actor );
+  GetImplementation( *this ).GetNaturalSize( naturalSize );
 }
 
-void Base::SetOffStage( Actor& actor )
+void Visual::Base::SetDepthIndex( int index )
 {
-  GetImplementation( *this ).SetOffStage( actor );
+  GetImplementation( *this ).SetDepthIndex( index );
 }
 
-void Base::RemoveAndReset( Actor& actor )
+int Visual::Base::GetDepthIndex() const
 {
-  if( actor && *this )
-  {
-    SetOffStage( actor );
-  }
-  Reset();
+  return GetImplementation( *this ).GetDepthIndex();
 }
 
-void Base::CreatePropertyMap( Property::Map& map ) const
+void Visual::Base::CreatePropertyMap( Property::Map& map ) const
 {
   GetImplementation( *this ).CreatePropertyMap( map );
 }
 
-} // namespace Visual
+
+
 
 } // namespace Toolkit