Merge "TextController refactor." into devel/master

[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 bcc9acd..f76aeed 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
@@ -149,16 +149,17 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
         }
         else // Regular image
         {
+          bool batchingEnabled( false );
           Property::Value* batchingEnabledValue = propertyMap.Find( Toolkit::ImageVisual::Property::BATCHING_ENABLED, BATCHING_ENABLED );
           if( batchingEnabledValue  )
           {
-            bool batchingEnabled( false );
             batchingEnabledValue->Get( batchingEnabled );
-            if( batchingEnabled )
-            {
-              visualPtr = new BatchImageVisual( *( mFactoryCache.Get() ) );
-              break;
-            }
+          }
+
+          if( batchingEnabled )
+          {
+            visualPtr = new BatchImageVisual( *( mFactoryCache.Get() ) );
+            break;
           }
           else
           {
@@ -218,17 +219,12 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image )
   NinePatchImage npatchImage = NinePatchImage::DownCast( image );
   if( npatchImage )
   {
-    NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
-    visualPtr->SetImage( npatchImage );
-
+    NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ), npatchImage );
     return Toolkit::Visual::Base( visualPtr );
   }
   else
   {
-    ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ) );
-    Actor actor;
-    visualPtr->SetImage( actor, image );
-
+    ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ), image );
     return Toolkit::Visual::Base( visualPtr );
   }
 }
@@ -249,23 +245,17 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, Image
   UrlType::Type type = ResolveUrlType( url );
   if( UrlType::N_PATCH == type )
   {
-    NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
-    visualPtr->SetImage( url );
-
+    NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ), url );
     return Toolkit::Visual::Base( visualPtr );
   }
   else if( UrlType::SVG == type )
   {
-    SvgVisual* visualPtr = new SvgVisual( *( mFactoryCache.Get() ) );
-    visualPtr->SetImage( url, size );
+    SvgVisual* visualPtr = new SvgVisual( *( mFactoryCache.Get() ), url, size );
     return Toolkit::Visual::Base( visualPtr );
   }
   else // Regular image
   {
-    ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ));
-    Actor actor;
-    visualPtr->SetImage( actor, url, size );
-
+    ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ), url, size );
     return Toolkit::Visual::Base( visualPtr );
   }
 }