Visual replacements logic updated

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / image-view / image-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
index 8ced30e..4183b89 100644 (file)
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -214,6 +214,9 @@ void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container )
 {
   Control::OnRelayout( size, container );
 
 {
   Control::OnRelayout( size, container );
 

+  // If visual is being replaced then mVisual will be the replacement visual even if not ready.
+  mVisual = DevelControl::GetVisual( *this, Toolkit::ImageView::Property::IMAGE );
+

   if( mVisual )
   {
     // Pass in an empty map which uses default transform values meaning our visual fills the control
   if( mVisual )
   {
     // Pass in an empty map which uses default transform values meaning our visual fills the control


@@ -224,7 +227,6 @@ void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container )
 
 void ImageView::OnResourceReady( Toolkit::Control control )
 {
 
 void ImageView::OnResourceReady( Toolkit::Control control )
 {

-  mVisual = DevelControl::GetVisual( *this, Toolkit::ImageView::Property::IMAGE );

 }
 
 ///////////////////////////////////////////////////////////
 }
 
 ///////////////////////////////////////////////////////////