Merge "Fixed an incorrect ellipsis" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / rendering / text-backend-impl.cpp

diff --git a/dali-toolkit/internal/text/rendering/text-backend-impl.cpp b/dali-toolkit/internal/text/rendering/text-backend-impl.cpp
index 87b8e6a..5ae10c8 100644 (file)
--- a/dali-toolkit/internal/text/rendering/text-backend-impl.cpp
+++ b/dali-toolkit/internal/text/rendering/text-backend-impl.cpp
@@ -19,11 +19,15 @@
 #include <dali-toolkit/internal/text/rendering/text-backend-impl.h>
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/adaptor-framework/singleton-service.h>
 #include <dali/integration-api/debug.h>
+#include <dali/devel-api/adaptor-framework/singleton-service.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.h>
+#include <dali-toolkit/public-api/text/rendering-backend.h>
+#include <dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h>
+#ifdef ENABLE_VECTOR_BASED_TEXT_RENDERING
+#include <dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.h>
+#endif
 
 namespace Dali
 {
@@ -84,21 +88,25 @@ RendererPtr Backend::NewRenderer( unsigned int renderingType )
 
   switch( renderingType )
   {
-    case Dali::Toolkit::Text::RENDERING_BASIC:
+    case Dali::Toolkit::Text::RENDERING_SHARED_ATLAS:
     {
-      renderer = Dali::Toolkit::Text::BasicRenderer::New();
+      renderer = Dali::Toolkit::Text::AtlasRenderer::New();
     }
     break;
 
-    case Dali::Toolkit::Text::RENDERING_SHARED_ATLAS:
+    case Dali::Toolkit::Text::RENDERING_VECTOR_BASED:
     {
-      // TODO
+#ifdef ENABLE_VECTOR_BASED_TEXT_RENDERING
+      renderer = Dali::Toolkit::Text::VectorBasedRenderer::New();
+#else
+      renderer = Dali::Toolkit::Text::AtlasRenderer::New(); // Fallback to bitmap-based rendering
+#endif
     }
     break;
 
     default:
     {
-      DALI_LOG_WARNING( "Unknown renderer type: %d", renderingType );
+      DALI_LOG_WARNING( "Unknown renderer type: %d\n", renderingType );
       break;
     }
   }