Merge "Changed button to use ImageView instead of ImageActor and enabled custom fragm...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / renderer-factory / renderer-factory.cpp

diff --git a/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.cpp b/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.cpp
index ce70893..6eaaea2 100644 (file)
--- a/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.cpp
+++ b/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.cpp
@@ -92,9 +92,9 @@ ControlRenderer RendererFactory::GetControlRenderer( const Vector4& color )
   return GetImplementation( *this ).GetControlRenderer( color );
 }
 
-bool RendererFactory::ResetRenderer( ControlRenderer& renderer, const Vector4& color )
+void RendererFactory::ResetRenderer( ControlRenderer& renderer, Actor& actor, const Vector4& color )
 {
-  return GetImplementation( *this ).ResetRenderer( renderer, color );
+  GetImplementation( *this ).ResetRenderer( renderer, actor, color );
 }
 
 ControlRenderer RendererFactory::GetControlRenderer( float borderSize, const Vector4& borderColor )
@@ -107,19 +107,24 @@ ControlRenderer RendererFactory::GetControlRenderer( const Image& image )
   return GetImplementation( *this ).GetControlRenderer( image );
 }
 
-bool RendererFactory::ResetRenderer( ControlRenderer& renderer, const Image& image )
+void RendererFactory::ResetRenderer( ControlRenderer& renderer, Actor& actor, const Image& image )
 {
-  return GetImplementation( *this ).ResetRenderer( renderer, image );
+  GetImplementation( *this ).ResetRenderer( renderer, actor, image );
 }
 
-ControlRenderer RendererFactory::GetControlRenderer( const std::string& url )
+ControlRenderer RendererFactory::GetControlRenderer( const std::string& url, ImageDimensions size )
 {
-  return GetImplementation( *this ).GetControlRenderer( url );
+  return GetImplementation( *this ).GetControlRenderer( url, size );
 }
 
-bool RendererFactory::ResetRenderer( ControlRenderer& renderer, const std::string& url )
+void RendererFactory::ResetRenderer( ControlRenderer& renderer, Actor& actor, const std::string& url, ImageDimensions size )
 {
-  return GetImplementation( *this ).ResetRenderer( renderer, url );
+  GetImplementation( *this ).ResetRenderer( renderer, actor, url, size );
+}
+
+void RendererFactory::ResetRenderer( ControlRenderer& renderer, Actor& actor, const Property::Map& propertyMap )
+{
+  GetImplementation( *this ).ResetRenderer( renderer, actor, propertyMap );
 }
 
 } // namespace Toolkit