Override image view's corner properties after resource ready

Change-Id: Icdcc8a254229be1834293a0f8d5b1a5aa7b962d9

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 6d8b661eafd352682985bbb5bfca585827e6811e..feab9b854779733458ff9430eaa607612ce5bc7e 100644 (file)
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -149,7 +149,6 @@ void ImageView::SetImage(const Property::Map& map)
     // This previous visual will be deleted when transition effect is done.
     Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(*this);
     controlDataImpl.EnableReadyTransitionOverridden(mVisual, true);
-    controlDataImpl.EnableCornerPropertiesOverridden(mVisual, true);
 
     DiscardImageViewVisual(mPreviousVisual);
     mPreviousVisual = mVisual;
@@ -198,6 +197,9 @@ void ImageView::SetImage(const Property::Map& map)
     }
 
     DevelControl::RegisterVisual(*this, Toolkit::ImageView::Property::IMAGE, visual, DepthIndex::CONTENT);
+
+    Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(*this);
+    controlDataImpl.EnableCornerPropertiesOverridden(mVisual, true);
   }
   else
   {
@@ -231,7 +233,6 @@ void ImageView::SetImage(const std::string& url, ImageDimensions size)
     // This previous visual will be deleted when transition effect is done.
     Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(*this);
     controlDataImpl.EnableReadyTransitionOverridden(mVisual, true);
-    controlDataImpl.EnableCornerPropertiesOverridden(mVisual, true);
 
     DiscardImageViewVisual(mPreviousVisual);
     mPreviousVisual = mVisual;
@@ -271,6 +272,9 @@ void ImageView::SetImage(const std::string& url, ImageDimensions size)
     }
 
     DevelControl::RegisterVisual(*this, Toolkit::ImageView::Property::IMAGE, visual, DepthIndex::CONTENT);
+
+    Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(*this);
+    controlDataImpl.EnableCornerPropertiesOverridden(mVisual, true);
   }
   else
   {
@@ -512,6 +516,10 @@ void ImageView::ShowPlaceholderImage()
   if(mPlaceholderVisual)
   {
     DevelControl::RegisterVisual(*this, Toolkit::ImageView::Property::PLACEHOLDER_IMAGE, mPlaceholderVisual, false);
+
+    Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(*this);
+    controlDataImpl.EnableCornerPropertiesOverridden(mVisual, true);
+
     Actor self = Self();
     Toolkit::GetImplementation(mPlaceholderVisual).SetOnScene(self);
   }