projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix SVACE error in KeyboardFocusManager" 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
d2e9ee2
..
239f5c4
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-factory-impl.cpp
+++ b/
dali-toolkit/internal/visuals/visual-factory-impl.cpp
@@
-28,7
+28,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
-#include <dali-toolkit/devel-api/visual
-factory/devel
-visual-properties.h>
+#include <dali-toolkit/devel-api/visual
s/text
-visual-properties.h>
#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
#include <dali-toolkit/internal/visuals/border/border-visual.h>
#include <dali-toolkit/internal/visuals/color/color-visual.h>
#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
#include <dali-toolkit/internal/visuals/border/border-visual.h>
#include <dali-toolkit/internal/visuals/color/color-visual.h>
@@
-40,6
+40,7
@@
#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/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/animated-image/animated-image-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>
#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>
@@
-64,6
+65,7
@@
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::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 )
DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, WIREFRAME )
DALI_ENUM_TO_STRING_TABLE_END( VISUAL_TYPE )
@@
-107,7
+109,7
@@
Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
}
else
{
}
else
{
- Property::Value* typeValue = propertyMap.Find( Toolkit::
Visual
Property::TYPE, VISUAL_TYPE );
+ Property::Value* typeValue = propertyMap.Find( Toolkit::
DevelVisual::
Property::TYPE, VISUAL_TYPE );
Toolkit::DevelVisual::Type visualType = Toolkit::DevelVisual::IMAGE; // Default to IMAGE type.
if( typeValue )
{
Toolkit::DevelVisual::Type visualType = Toolkit::DevelVisual::IMAGE; // Default to IMAGE type.
if( typeValue )
{
@@
-118,19
+120,19
@@
Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
{
case Toolkit::Visual::BORDER:
{
{
case Toolkit::Visual::BORDER:
{
- visualPtr = BorderVisual::New( *( mFactoryCache.Get() ) );
+ visualPtr = BorderVisual::New( *( mFactoryCache.Get() )
, propertyMap
);
break;
}
case Toolkit::Visual::COLOR:
{
break;
}
case Toolkit::Visual::COLOR:
{
- visualPtr = ColorVisual::New( *( mFactoryCache.Get() ) );
+ visualPtr = ColorVisual::New( *( mFactoryCache.Get() )
, propertyMap
);
break;
}
case Toolkit::Visual::GRADIENT:
{
break;
}
case Toolkit::Visual::GRADIENT:
{
- visualPtr = GradientVisual::New( *( mFactoryCache.Get() ) );
+ visualPtr = GradientVisual::New( *( mFactoryCache.Get() )
, propertyMap
);
break;
}
break;
}
@@
-144,11
+146,15
@@
Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
UrlType::Type type = ResolveUrlType( imageUrl );
if( UrlType::N_PATCH == type )
{
UrlType::Type type = ResolveUrlType( imageUrl );
if( UrlType::N_PATCH == type )
{
- visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), imageUrl );
+ visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), imageUrl
, propertyMap
);
}
else if( UrlType::SVG == type )
{
}
else if( UrlType::SVG == type )
{
- visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), imageUrl );
+ visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
+ }
+ else if( UrlType::GIF == type )
+ {
+ visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
}
else // Regular image
{
}
else // Regular image
{
@@
-161,12
+167,11
@@
Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
if( batchingEnabled )
{
if( batchingEnabled )
{
- visualPtr = BatchImageVisual::New( *( mFactoryCache.Get() ), imageUrl );
- break;
+ visualPtr = BatchImageVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
}
else
{
}
else
{
- visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), imageUrl );
+ visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), imageUrl
, propertyMap
);
}
}
}
}
}
}
@@
-176,13
+181,13
@@
Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
case Toolkit::Visual::MESH:
{
case Toolkit::Visual::MESH:
{
- visualPtr = MeshVisual::New( *( mFactoryCache.Get() ) );
+ visualPtr = MeshVisual::New( *( mFactoryCache.Get() )
, propertyMap
);
break;
}
case Toolkit::Visual::PRIMITIVE:
{
break;
}
case Toolkit::Visual::PRIMITIVE:
{
- visualPtr = PrimitiveVisual::New( *( mFactoryCache.Get() ) );
+ visualPtr = PrimitiveVisual::New( *( mFactoryCache.Get() )
, propertyMap
);
break;
}
break;
}
@@
-194,17
+199,13
@@
Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
case Toolkit::DevelVisual::TEXT:
{
case Toolkit::DevelVisual::TEXT:
{
- visualPtr = TextVisual::New( *( mFactoryCache.Get() ) );
+ visualPtr = TextVisual::New( *( mFactoryCache.Get() )
, propertyMap
);
break;
}
}
}
break;
}
}
}
- if( visualPtr )
- {
- visualPtr->SetProperties( propertyMap );
- }
- else
+ if( !visualPtr )
{
DALI_LOG_ERROR( "Renderer type unknown\n" );
}
{
DALI_LOG_ERROR( "Renderer type unknown\n" );
}
@@
-263,6
+264,10
@@
Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, Image
{
visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), url );
}
{
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 );
else // Regular image
{
visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), url, size );