Remove Constraints from Cluster,ToolBar,View & ImageView

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

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 52b2536..7cb6cb4 100644 (file)
--- a/optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -1,20 +1,28 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// 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;
@@ -86,7 +94,8 @@ Dali::Toolkit::ImageView ImageView::New()
 }
 
 ImageView::ImageView()
-: ControlImpl(true)
+: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),
+  mPropertyDetail( Property::INVALID_INDEX )
 {
 }
 
@@ -100,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 );
 }
 
@@ -109,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)
@@ -175,7 +188,7 @@ void ImageView::SetImageDistanceField(const std::string& filename)
   mImageActor.SetImage( image );
 
   DistanceFieldEffect effect = DistanceFieldEffect::New();
-  Self().SetShaderEffect( effect );
+  mImageActor.SetShaderEffect( effect );
 }
 
 void ImageView::SetImage(Image image)