X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=optional%2Fdali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.cpp;h=7cb6cb405bbd90f76499badfc211cecf3bb80db8;hb=4c9e3c8180e813f24d7514b275abd0d79c155405;hp=2601644c15b6418e013f72930973e63bf1d16931;hpb=fc6bf44b9a9ba244d7c8a92a88b4b8688c5bfa0b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
index 2601644..7cb6cb4 100644
--- a/optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -15,7 +15,14 @@
  *
  */
 
+// CLASS HEADER
 #include <dali-toolkit/internal/controls/image-view/image-view-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES
 #include <dali-toolkit/public-api/shader-effects/distance-field-effect.h>
 
 using namespace Dali;
@@ -87,7 +94,8 @@ Dali::Toolkit::ImageView ImageView::New()
 }
 
 ImageView::ImageView()
-: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) )
+: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),
+  mPropertyDetail( Property::INVALID_INDEX )
 {
 }
 
@@ -101,7 +109,6 @@ void ImageView::Initialize()
   Image emptyImage;
   mImageActor = ImageActor::New( emptyImage );
   self.Add( mImageActor );
-  mImageActor.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
   mImageActor.SetParentOrigin( ParentOrigin::CENTER );
 }
 
@@ -110,6 +117,11 @@ ImageView::~ImageView()
 
 }
 
+void ImageView::OnControlSizeSet( const Vector3& targetSize )
+{
+  mImageActor.SetSize( targetSize );
+}
+
 void ImageView::SetImage(const std::string& filename, ImageType type, float min, float max)
 {
   switch(type)