Merge "Fix for the cursor position with the arabic script." into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / renderers / renderer-factory-impl.cpp

diff --git a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
index fe00209..e1c75a2 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
+++ b/dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
@@ -33,6 +33,7 @@
 #include <dali-toolkit/internal/controls/renderers/image/image-renderer.h>
 #include <dali-toolkit/internal/controls/renderers/svg/svg-renderer.h>
 #include <dali-toolkit/internal/controls/renderers/mesh/mesh-renderer.h>
+#include <dali-toolkit/internal/controls/renderers/primitive/primitive-renderer.h>
 #include <dali-toolkit/internal/controls/renderers/renderer-factory-cache.h>
 #include <dali-toolkit/internal/controls/renderers/renderer-string-constants.h>
 #include <dali-toolkit/internal/controls/renderers/image-atlas-manager.h>
@@ -103,6 +104,10 @@ RendererFactory::RendererType RendererFactory::GetRendererType( const Property::
     {
       rendererType = MESH;
     }
+    else if( typeValue == PRIMITIVE_RENDERER )
+    {
+      rendererType = PRIMITIVE;
+    }
   }
 
   // check the url if exist, to decide the renderer type
@@ -130,7 +135,7 @@ RendererFactory::RendererType RendererFactory::GetRendererType( const Property::
   return rendererType;
 }
 
-Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Property::Map& propertyMap )
+Toolkit::ControlRenderer RendererFactory::CreateControlRenderer( const Property::Map& propertyMap )
 {
   ControlRenderer* rendererPtr = NULL;
 
@@ -187,6 +192,11 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Property::Ma
       rendererPtr = new MeshRenderer( *( mFactoryCache.Get() ) );
       break;
     }
+    case PRIMITIVE:
+    {
+      rendererPtr = new PrimitiveRenderer( *( mFactoryCache.Get() ) );
+      break;
+    }
     case UNDEFINED:
     default:
     {
@@ -207,72 +217,7 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Property::Ma
   return Toolkit::ControlRenderer( rendererPtr );
 }
 
-Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Vector4& color )
-{
-  if( !mFactoryCache )
-  {
-    mFactoryCache = new RendererFactoryCache();
-  }
-
-  if( mDebugEnabled )
-  {
-    return Toolkit::ControlRenderer( new DebugRenderer( *( mFactoryCache.Get() ) ) );
-  }
-
-  ColorRenderer* rendererPtr = new ColorRenderer( *( mFactoryCache.Get() ) );
-  rendererPtr->SetColor( color );
-
-  return Toolkit::ControlRenderer( rendererPtr );
-}
-
-void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Vector4& color )
-{
-  if( mDebugEnabled && renderer )
-  {
-    return;
-  }
-
-  if( renderer )
-  {
-    ColorRenderer* rendererPtr = dynamic_cast< ColorRenderer* >( &GetImplementation( renderer ) );
-    if( rendererPtr )
-    {
-      rendererPtr->SetColor( color );
-      return;
-    }
-
-    renderer.RemoveAndReset( actor );
-  }
-
-  renderer = GetControlRenderer( color );
-  if( actor && actor.OnStage() )
-  {
-    renderer.SetOnStage( actor );
-  }
-}
-
-Toolkit::ControlRenderer RendererFactory::GetControlRenderer( float borderSize, const Vector4& borderColor, bool antiAliasing )
-{
-  if( !mFactoryCache )
-  {
-    mFactoryCache = new RendererFactoryCache();
-  }
-
-  if( mDebugEnabled )
-  {
-    return Toolkit::ControlRenderer( new DebugRenderer( *( mFactoryCache.Get() ) ) );
-  }
-
-  BorderRenderer* rendererPtr = new BorderRenderer( *mFactoryCache.Get() );
-
-  rendererPtr->SetBorderSize( borderSize );
-  rendererPtr->SetBorderColor( borderColor );
-  rendererPtr->RequireAntiAliasing( antiAliasing );
-
-  return Toolkit::ControlRenderer( rendererPtr );
-}
-
-Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Image& image )
+Toolkit::ControlRenderer RendererFactory::CreateControlRenderer( const Image& image )
 {
   if( !mFactoryCache )
   {
@@ -303,53 +248,7 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const Image& image
   }
 }
 
-void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Image& image )
-{
-  if( mDebugEnabled && renderer )
-  {
-    return;
-  }
-
-  if( renderer )
-  {
-    if( ! image )
-    {
-      // If the image is empty, then reset the renderer and return
-      renderer.RemoveAndReset( actor );
-      return;
-    }
-
-    NinePatchImage npatchImage = NinePatchImage::DownCast( image );
-    if( npatchImage )
-    {
-      NPatchRenderer* rendererPtr = dynamic_cast< NPatchRenderer* >( &GetImplementation( renderer ) );
-      if( rendererPtr )
-      {
-        rendererPtr->SetImage( npatchImage );
-        return;
-      }
-    }
-    else
-    {
-      ImageRenderer* rendererPtr = dynamic_cast< ImageRenderer* >( &GetImplementation( renderer ) );
-      if( rendererPtr )
-      {
-        rendererPtr->SetImage( actor, image );
-        return;
-      }
-    }
-
-    renderer.RemoveAndReset( actor );
-  }
-
-  renderer = GetControlRenderer( image );
-  if( actor && actor.OnStage() )
-  {
-    renderer.SetOnStage( actor );
-  }
-}
-
-Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const std::string& url, ImageDimensions size )
+Toolkit::ControlRenderer RendererFactory::CreateControlRenderer( const std::string& url, ImageDimensions size )
 {
   if( !mFactoryCache )
   {
@@ -386,96 +285,6 @@ Toolkit::ControlRenderer RendererFactory::GetControlRenderer( const std::string&
   }
 }
 
-void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const std::string& url, ImageDimensions size )
-{
-  if( mDebugEnabled && renderer )
-  {
-    return;
-  }
-
-  if( renderer )
-  {
-    if( url.empty() )
-    {
-      // If the URL is empty, then reset the renderer and return
-      renderer.RemoveAndReset( actor );
-      return;
-    }
-    else if( NinePatchImage::IsNinePatchUrl( url ) )
-    {
-      NPatchRenderer* rendererPtr = dynamic_cast< NPatchRenderer* >( &GetImplementation( renderer ) );
-      if( rendererPtr )
-      {
-        rendererPtr->SetImage( url );
-        return;
-      }
-    }
-    else if( SvgRenderer::IsSvgUrl( url ) )
-    {
-      SvgRenderer* rendererPtr = dynamic_cast< SvgRenderer* >( &GetImplementation( renderer ) );
-      if( rendererPtr )
-      {
-        rendererPtr->SetImage( url, size );
-        return;
-      }
-    }
-    else
-    {
-      ImageRenderer* rendererPtr = dynamic_cast< ImageRenderer* >( &GetImplementation( renderer ) );
-      if( rendererPtr )
-      {
-        rendererPtr->SetImage( actor, url, size );
-        return;
-      }
-    }
-
-    renderer.RemoveAndReset( actor );
-  }
-
-  renderer = GetControlRenderer( url, size );
-  if( actor && actor.OnStage() )
-  {
-    renderer.SetOnStage( actor );
-  }
-}
-
-void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor& actor, const Property::Map& propertyMap )
-{
-  if( mDebugEnabled && renderer )
-  {
-    return;
-  }
-
-  if( renderer )
-  {
-    ControlRenderer& controlRenderer = GetImplementation( renderer );
-
-    RendererType type = GetRendererType( propertyMap );
-
-    //If there's no renderer type specified or if there hasn't been a renderer type change then we can reuse the renderer
-    if( type == UNDEFINED ||
-        ( type == IMAGE     && typeid( controlRenderer ) == typeid( ImageRenderer ) ) ||
-        ( type == N_PATCH   && typeid( controlRenderer ) == typeid( NPatchRenderer ) ) ||
-        ( type == COLOR     && typeid( controlRenderer ) == typeid( ColorRenderer ) ) ||
-        ( type == GRADIENT  && typeid( controlRenderer ) == typeid( GradientRenderer ) ) ||
-        ( type == BORDER    && typeid( controlRenderer ) == typeid( BorderRenderer ) ) ||
-        ( type == SVG       && typeid( controlRenderer ) == typeid( SvgRenderer ) ) ||
-        ( type == MESH      && typeid( controlRenderer ) == typeid( MeshRenderer ) ) )
-    {
-      controlRenderer.Initialize( actor, propertyMap );
-      return;
-    }
-
-    renderer.RemoveAndReset( actor );
-  }
-
-  renderer = GetControlRenderer( propertyMap );
-  if( renderer && actor && actor.OnStage() )
-  {
-    renderer.SetOnStage( actor );
-  }
-}
-
 Image RendererFactory::GetBrokenRendererImage()
 {
   return ResourceImage::New( BROKEN_RENDERER_IMAGE_URL );