Merge "Add new layouting support for TextLabel and ImageView." into devel/master

[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 720ef21..11d5389 100755 (executable)
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -119,6 +119,8 @@ void ImageView::SetImage( Image image )
     // Trigger a size negotiation request that may be needed when unregistering a visual.
     RelayoutRequest();
   }
     // Trigger a size negotiation request that may be needed when unregistering a visual.
     RelayoutRequest();
   }

+
+  Toolkit::DevelControl::RequestLayout( *this );

 }
 
 void ImageView::SetImage( const Property::Map& map )
 }
 
 void ImageView::SetImage( const Property::Map& map )


@@ -147,6 +149,8 @@ void ImageView::SetImage( const Property::Map& map )
     // Trigger a size negotiation request that may be needed when unregistering a visual.
     RelayoutRequest();
   }
     // Trigger a size negotiation request that may be needed when unregistering a visual.
     RelayoutRequest();
   }

+
+  Toolkit::DevelControl::RequestLayout( *this );

 }
 
 void ImageView::SetImage( const std::string& url, ImageDimensions size )
 }
 
 void ImageView::SetImage( const std::string& url, ImageDimensions size )


@@ -175,6 +179,8 @@ void ImageView::SetImage( const std::string& url, ImageDimensions size )
     // Trigger a size negotiation request that may be needed when unregistering a visual.
     RelayoutRequest();
   }
     // Trigger a size negotiation request that may be needed when unregistering a visual.
     RelayoutRequest();
   }

+
+  Toolkit::DevelControl::RequestLayout( *this );

 }
 
 Image ImageView::GetImage() const
 }
 
 Image ImageView::GetImage() const