X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-impl.cpp;h=e829889a7cab8fb2b6fe05cc5f9081cd167dc4b6;hp=92cc53c9de6e033cd215e6b8b3e0954f73098a57;hb=097a9080258eb6e9548ef81f8c4177470e06d267;hpb=d748f6c99a59e045b8a8d267012372f996cbc3fd diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp index 92cc53c..e829889 100644 --- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include // INTERNAL INCLUDES @@ -40,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -57,18 +57,6 @@ namespace Internal namespace { -DALI_ENUM_TO_STRING_TABLE_BEGIN( VISUAL_TYPE ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, BORDER ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, COLOR ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, GRADIENT ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, IMAGE ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, MESH ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, PRIMITIVE ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::DevelVisual, TEXT ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, WIREFRAME ) -DALI_ENUM_TO_STRING_TABLE_END( VISUAL_TYPE ) - -const char * const VISUAL_TYPE( "visualType" ); const char * const BATCHING_ENABLED( "batchingEnabled" ); BaseHandle Create() { @@ -151,6 +139,10 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property { visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap ); } + else if( UrlType::GIF == type ) + { + visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap ); + } else // Regular image { bool batchingEnabled( false ); @@ -259,6 +251,10 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, Image { visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), url ); } + else if( UrlType::GIF == type ) + { + visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), url ); + } else // Regular image { visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), url, size );