X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Frenderer-factory-impl.cpp;h=b9d1d4015a59389101736e310b2ae97b5af12b90;hb=refs%2Fchanges%2F40%2F49040%2F8;hp=92fd3bf0e7ab4d087cbfcdf63e88fff775aed8eb;hpb=618c084142032296c60a188b9438d63a81a2d264;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
index 92fd3bf..b9d1d40 100644
--- a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
+++ b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
@@ -83,35 +83,36 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Property::Ma
   std::string typeValue ;
   if( type && type->Get( typeValue ))
   {
+    if( !mFactoryCache )
+    {
+      mFactoryCache = new RendererFactoryCache();
+    }
+
     if( typeValue ==  COLOR_RENDERER )
     {
-      rendererPtr = new ColorRenderer();
+      rendererPtr = new ColorRenderer( *( mFactoryCache.Get() ) );
     }
     else if( typeValue ==  GRADIENT_RENDERER )
     {
-      rendererPtr = new GradientRenderer();
+      rendererPtr = new GradientRenderer( *( mFactoryCache.Get() ) );
     }
     else if( typeValue ==  IMAGE_RENDERER )
     {
-      rendererPtr = new ImageRenderer();
+      rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ) );
     }
     else if( typeValue ==  N_PATCH_RENDERER )
     {
-      rendererPtr = new NPatchRenderer();
+      rendererPtr = new NPatchRenderer( *( mFactoryCache.Get() ) );
     }
     else if( typeValue == BORDER_RENDERER )
     {
-      rendererPtr = new BorderRenderer();
+      rendererPtr = new BorderRenderer( *( mFactoryCache.Get() ) );
     }
   }
 
   if( rendererPtr )
   {
-    if( !mFactoryCache )
-    {
-      mFactoryCache = new RendererFactoryCache();
-    }
-    rendererPtr->Initialize( *( mFactoryCache.Get() ), propertyMap );
+    rendererPtr->Initialize( propertyMap );
   }
   else
   {
@@ -123,14 +124,12 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Property::Ma
 
 Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Vector4& color )
 {
-  ColorRenderer* rendererPtr = new ColorRenderer();
-
   if( !mFactoryCache )
   {
     mFactoryCache = new RendererFactoryCache();
   }
-  rendererPtr->Initialize( *( mFactoryCache.Get() ) );
 
+  ColorRenderer* rendererPtr = new ColorRenderer( *( mFactoryCache.Get() ) );
   rendererPtr->SetColor( color );
 
   return Toolkit::ControlRenderer( rendererPtr );
@@ -153,13 +152,16 @@ bool RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, const V
 
 Toolkit::ControlRenderer RendererFactory::GetControlRenderer( float borderSize, const Vector4& borderColor )
 {
-  BorderRenderer* rendererPtr = new BorderRenderer();
+  if( !mFactoryCache )
+  {
+    mFactoryCache = new RendererFactoryCache();
+  }
+  BorderRenderer* rendererPtr = new BorderRenderer( *mFactoryCache.Get() );
 
   if( !mFactoryCache )
   {
     mFactoryCache = new RendererFactoryCache();
   }
-  rendererPtr->Initialize( *( mFactoryCache.Get() ) );
 
   rendererPtr->SetBorderSize( borderSize );
   rendererPtr->SetBorderColor( borderColor );
@@ -177,16 +179,14 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Image& image
   NinePatchImage npatchImage = NinePatchImage::DownCast( image );
   if( npatchImage )
   {
-    NPatchRenderer* rendererPtr = new NPatchRenderer();
-    rendererPtr->Initialize( *( mFactoryCache.Get() ) );
+    NPatchRenderer* rendererPtr = new NPatchRenderer( *( mFactoryCache.Get() ) );
     rendererPtr->SetImage( npatchImage );
 
     return Toolkit::ControlRenderer( rendererPtr );
   }
   else
   {
-    ImageRenderer* rendererPtr = new ImageRenderer();
-    rendererPtr->Initialize( *( mFactoryCache.Get() ) );
+    ImageRenderer* rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ) );
     rendererPtr->SetImage( image );
 
     return Toolkit::ControlRenderer( rendererPtr );
@@ -221,26 +221,21 @@ bool RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, const I
 
 Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const std::string& url )
 {
+  if( !mFactoryCache )
+  {
+    mFactoryCache = new RendererFactoryCache();
+  }
+
   if( NinePatchImage::IsNinePatchUrl( url ) )
   {
-    NPatchRenderer* rendererPtr = new NPatchRenderer();
-    if( !mFactoryCache )
-    {
-      mFactoryCache = new RendererFactoryCache();
-    }
-    rendererPtr->Initialize( *( mFactoryCache.Get() ) );
+    NPatchRenderer* rendererPtr = new NPatchRenderer( *( mFactoryCache.Get() ) );
     rendererPtr->SetImage( url );
 
     return Toolkit::ControlRenderer( rendererPtr );
   }
   else
   {
-    ImageRenderer* rendererPtr = new ImageRenderer();
-    if( !mFactoryCache )
-    {
-      mFactoryCache = new RendererFactoryCache();
-    }
-    rendererPtr->Initialize( *( mFactoryCache.Get() ) );
+    ImageRenderer* rendererPtr = new ImageRenderer( *( mFactoryCache.Get() ) );
     rendererPtr->SetImage( url );
 
     return Toolkit::ControlRenderer( rendererPtr );
@@ -274,6 +269,44 @@ bool RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, const s
   }
 }
 
+bool RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, const Property::Map& propertyMap )
+{
+  Property::Value* type = propertyMap.Find( RENDERER_TYPE_NAME );
+  std::string typeValue ;
+  if( type && type->Get( typeValue ))
+  {
+    //If there's been a renderer type change then we have to return a new shader
+    if( typeValue ==  COLOR_RENDERER && typeid( renderer ) != typeid( ColorRenderer ) )
+    {
+      renderer = GetControlRenderer( propertyMap );
+      return true;
+    }
+    else if( typeValue ==  GRADIENT_RENDERER && typeid( renderer ) != typeid( GradientRenderer ) )
+    {
+      renderer = GetControlRenderer( propertyMap );
+      return true;
+    }
+    else if( typeValue ==  IMAGE_RENDERER && typeid( renderer ) != typeid( ImageRenderer ) )
+    {
+      renderer = GetControlRenderer( propertyMap );
+      return true;
+    }
+    else if( typeValue ==  N_PATCH_RENDERER && typeid( renderer ) != typeid( NPatchRenderer ) )
+    {
+      renderer = GetControlRenderer( propertyMap );
+      return true;
+    }
+    else if( typeValue ==  BORDER_RENDERER && typeid( renderer ) != typeid( BorderRenderer ) )
+    {
+      renderer = GetControlRenderer( propertyMap );
+      return true;
+    }
+  }
+
+  GetImplementation( renderer ).Initialize( propertyMap );
+  return false;
+}
+
 } // namespace Internal
 
 } // namespace Toolkit