Visuals call SetProperties internally for 2-stage initialization

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / visual-factory-impl.cpp

diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
index 9fab730..c9e1852 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
@@ -117,19 +117,19 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
     {
       case Toolkit::Visual::BORDER:
       {
-        visualPtr = BorderVisual::New( *( mFactoryCache.Get() ) );
+        visualPtr = BorderVisual::New( *( mFactoryCache.Get() ), propertyMap );
         break;
       }
 
       case Toolkit::Visual::COLOR:
       {
-        visualPtr = ColorVisual::New( *( mFactoryCache.Get() ) );
+        visualPtr = ColorVisual::New( *( mFactoryCache.Get() ), propertyMap );
         break;
       }
 
       case Toolkit::Visual::GRADIENT:
       {
-        visualPtr = GradientVisual::New( *( mFactoryCache.Get() ) );
+        visualPtr = GradientVisual::New( *( mFactoryCache.Get() ), propertyMap );
         break;
       }
 
@@ -143,11 +143,11 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
           UrlType::Type type = ResolveUrlType( imageUrl );
           if( UrlType::N_PATCH == type )
           {
-            visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), imageUrl );
+            visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
           }
           else if( UrlType::SVG == type )
           {
-            visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), imageUrl );
+            visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
           }
           else // Regular image
           {
@@ -160,12 +160,11 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
 
             if( batchingEnabled )
             {
-              visualPtr = BatchImageVisual::New( *( mFactoryCache.Get() ), imageUrl );
-              break;
+              visualPtr = BatchImageVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
             }
             else
             {
-              visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), imageUrl );
+              visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
             }
           }
         }
@@ -175,13 +174,13 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
 
       case Toolkit::Visual::MESH:
       {
-        visualPtr = MeshVisual::New( *( mFactoryCache.Get() ) );
+        visualPtr = MeshVisual::New( *( mFactoryCache.Get() ), propertyMap );
         break;
       }
 
       case Toolkit::Visual::PRIMITIVE:
       {
-        visualPtr = PrimitiveVisual::New( *( mFactoryCache.Get() ) );
+        visualPtr = PrimitiveVisual::New( *( mFactoryCache.Get() ), propertyMap );
         break;
       }
 
@@ -193,17 +192,13 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
 
       case Toolkit::DevelVisual::TEXT:
       {
-        visualPtr = TextVisual::New( *( mFactoryCache.Get() ) );
+        visualPtr = TextVisual::New( *( mFactoryCache.Get() ), propertyMap );
         break;
       }
     }
   }
 
-  if( visualPtr )
-  {
-    visualPtr->SetProperties( propertyMap );
-  }
-  else
+  if( !visualPtr )
   {
     DALI_LOG_ERROR( "Renderer type unknown\n" );
   }