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 "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
71fc2ba
..
76d0ba7
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-factory-impl.cpp
+++ b/
dali-toolkit/internal/visuals/visual-factory-impl.cpp
@@
-226,17
+226,12
@@
Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image )
NinePatchImage npatchImage = NinePatchImage::DownCast( image );
if( npatchImage )
{
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
{
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 );
}
}
return Toolkit::Visual::Base( visualPtr );
}
}
@@
-257,23
+252,17
@@
Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, Image
UrlType::Type type = ResolveUrlType( url );
if( UrlType::N_PATCH == type )
{
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 )
{
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
{
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 );
}
}
return Toolkit::Visual::Base( visualPtr );
}
}