Remove Constraints from Cluster,ToolBar,View & ImageView

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

diff --git a/optional/dali-toolkit/internal/controls/view/view-impl.cpp b/optional/dali-toolkit/internal/controls/view/view-impl.cpp
index fa2a9d6..6c374c0 100644 (file)
--- a/optional/dali-toolkit/internal/controls/view/view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/view/view-impl.cpp
@@ -16,10 +16,12 @@
  */
 
 // CLASS HEADER
-
 #include "view-impl.h"
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/object/type-registry.h>
 
 // INTERNAL INCLUDES
 
@@ -134,7 +136,7 @@ void View::SetBackground( ImageActor backgroundImage )
     mBackgroundLayer = Layer::New();
 
     mBackgroundLayer.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
-    mBackgroundLayer.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
+    mBackgroundLayer.SetSize( mViewSize );
 
     // Add background layer to custom actor.
     Self().Add( mBackgroundLayer );
@@ -154,12 +156,7 @@ void View::SetBackground( ImageActor backgroundImage )
   }
 
   backgroundImage.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
-  Constraint constraint = Constraint::New<Vector3>(
-      Actor::SCALE,
-      LocalSource( Actor::SIZE ),
-      ParentSource( Actor::SIZE ),
-      ScaleToFillXYKeepAspectRatioConstraint() );
-  backgroundImage.ApplyConstraint( constraint );
+  backgroundImage.SetScale( FillXYKeepAspectRatio( mViewSize, backgroundImage.GetSize() ) );
   mBackgroundLayer.Add( backgroundImage );
 }
 
@@ -231,10 +228,8 @@ void View::OrientationChanged( Dali::Orientation orientation )
     }
   }
 
-  mRotateAnimation.SetDestroyAction( Animation::Bake );
-
   Toolkit::View handle( GetOwner() );
-  mOrientationAnimationStartedSignalV2.Emit( handle, mRotateAnimation, orientation );
+  mOrientationAnimationStartedSignal.Emit( handle, mRotateAnimation, orientation );
 
   mRotateAnimation.Play();
 }
@@ -244,9 +239,9 @@ void View::SetAutoRotate( bool enabled )
   mAutoRotateEnabled = enabled;
 }
 
-Toolkit::View::OrientationAnimationStartedSignalV2& View::OrientationAnimationStartedSignal()
+Toolkit::View::OrientationAnimationStartedSignalType& View::OrientationAnimationStartedSignal()
 {
-  return mOrientationAnimationStartedSignalV2;
+  return mOrientationAnimationStartedSignal;
 }
 
 bool View::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
@@ -299,6 +294,20 @@ void View::OnInitialize()
   }
 }
 
+void View::OnControlSizeSet( const Vector3& targetSize )
+{
+  mViewSize = targetSize;
+  if( mBackgroundLayer )
+  {
+    mBackgroundLayer.SetSize( mViewSize );
+    if( mBackgroundLayer.GetChildCount() > 0 )
+    {
+      Actor background = mBackgroundLayer.GetChildAt(0);
+      background.SetScale( FillXYKeepAspectRatio( mViewSize, background.GetSize() ) );
+    }
+  }
+}
+
 View::Orientation View::DegreeToViewOrientation( Degree degree )
 {
   View::Orientation orientation = PORTRAIT;