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 82b91b7..6c374c0 100644 (file)
--- a/optional/dali-toolkit/internal/controls/view/view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/view/view-impl.cpp
@@ -136,7 +136,7 @@ void View::SetBackground( ImageActor backgroundImage )
     mBackgroundLayer = Layer::New();
 
     mBackgroundLayer.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
     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 );
 
     // Add background layer to custom actor.
     Self().Add( mBackgroundLayer );


@@ -156,12 +156,7 @@ void View::SetBackground( ImageActor backgroundImage )
   }
 
   backgroundImage.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
   }
 
   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 );
 }
 
   mBackgroundLayer.Add( backgroundImage );
 }
 


@@ -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;
 View::Orientation View::DegreeToViewOrientation( Degree degree )
 {
   View::Orientation orientation = PORTRAIT;