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
(ImageView) Restore erroneously removed APIs & Fix SetImage behaviour
[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
0a25ffa
..
6b2e22e
100644
(file)
--- a/
dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
+++ b/
dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
@@
-212,6
+212,13
@@
void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor&
{
if( renderer )
{
{
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 )
{
NinePatchImage npatchImage = NinePatchImage::DownCast( image );
if( npatchImage )
{
@@
-271,7
+278,13
@@
void RendererFactory::ResetRenderer( Toolkit::ControlRenderer& renderer, Actor&
{
if( renderer )
{
{
if( renderer )
{
- if( NinePatchImage::IsNinePatchUrl( url ) )
+ 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 )
{
NPatchRenderer* rendererPtr = dynamic_cast< NPatchRenderer* >( &GetImplementation( renderer ) );
if( rendererPtr )