Merge "TextVisual implementation." 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 6baaec2..76d0ba7 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
@@ -38,6 +38,7 @@
 #include <dali-toolkit/internal/visuals/npatch/npatch-visual.h>
 #include <dali-toolkit/internal/visuals/primitive/primitive-visual.h>
 #include <dali-toolkit/internal/visuals/svg/svg-visual.h>
+#include <dali-toolkit/internal/visuals/text/text-visual.h>
 #include <dali-toolkit/internal/visuals/wireframe/wireframe-visual.h>
 #include <dali-toolkit/internal/visuals/visual-factory-cache.h>
 #include <dali-toolkit/internal/visuals/visual-factory-resolve-url.h>
@@ -189,6 +190,12 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
       break;
     }
 
+    case Toolkit::Visual::TEXT:
+    {
+      visualPtr = new TextVisual( *( mFactoryCache.Get() ) );
+      break;
+    }
+
   }
 
   if( visualPtr )
@@ -219,17 +226,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 );
   }
 }
@@ -250,23 +252,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 );
   }
 }