From 9cf6410e88ddcab2c0a134846a77b8e670fd6398 Mon Sep 17 00:00:00 2001 From: Ferran Sole Date: Thu, 18 Feb 2016 17:26:19 +0000 Subject: [PATCH] Changes following deprecation of position inheritance modes Change-Id: Ia04c81329062610182df63da05b58def4c3d927f --- .../cube-transition-effect/cube-transition-effect-example.cpp | 6 +++--- examples/dissolve-effect/dissolve-effect-example.cpp | 8 ++++---- examples/radial-menu/radial-menu-example.cpp | 8 ++++---- examples/radial-menu/radial-sweep-view-impl.cpp | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/examples/cube-transition-effect/cube-transition-effect-example.cpp b/examples/cube-transition-effect/cube-transition-effect-example.cpp index 621244e..38dbd4a 100644 --- a/examples/cube-transition-effect/cube-transition-effect-example.cpp +++ b/examples/cube-transition-effect/cube-transition-effect-example.cpp @@ -260,7 +260,7 @@ void CubeTransitionApp::OnInit( Application& application ) mCubeWaveEffect.TransitionCompletedSignal().Connect(this, &CubeTransitionApp::OnTransitionCompleted); mCubeWaveEffect.SetSize( mViewSize ); - mCubeWaveEffect.SetPositionInheritanceMode( USE_PARENT_POSITION ); + mCubeWaveEffect.SetParentOrigin( ParentOrigin::CENTER ); mCubeWaveEffect.SetCurrentImage( mCurrentImage ); // use big cubes @@ -270,7 +270,7 @@ void CubeTransitionApp::OnInit( Application& application ) mCubeCrossEffect.TransitionCompletedSignal().Connect(this, &CubeTransitionApp::OnTransitionCompleted); mCubeCrossEffect.SetSize( mViewSize ); - mCubeCrossEffect.SetPositionInheritanceMode( USE_PARENT_POSITION ); + mCubeCrossEffect.SetParentOrigin( ParentOrigin::CENTER ); mCubeCrossEffect.SetCurrentImage( mCurrentImage ); mCubeFoldEffect = Toolkit::CubeTransitionFoldEffect::New( NUM_ROWS_FOLD, NUM_COLUMNS_FOLD ); @@ -278,7 +278,7 @@ void CubeTransitionApp::OnInit( Application& application ) mCubeFoldEffect.TransitionCompletedSignal().Connect(this, &CubeTransitionApp::OnTransitionCompleted); mCubeFoldEffect.SetSize( mViewSize ); - mCubeFoldEffect.SetPositionInheritanceMode( USE_PARENT_POSITION ); + mCubeFoldEffect.SetParentOrigin( ParentOrigin::CENTER ); mCubeFoldEffect.SetCurrentImage( mCurrentImage ); mViewTimer = Timer::New( VIEWINGTIME ); diff --git a/examples/dissolve-effect/dissolve-effect-example.cpp b/examples/dissolve-effect/dissolve-effect-example.cpp index 10d1721..e9b9493 100644 --- a/examples/dissolve-effect/dissolve-effect-example.cpp +++ b/examples/dissolve-effect/dissolve-effect-example.cpp @@ -255,12 +255,12 @@ void DissolveEffectApp::OnInit( Application& application ) // Set size to stage size to avoid seeing a black border on transition mParent = Actor::New(); mParent.SetSize( Stage::GetCurrent().GetSize() ); - mParent.SetPositionInheritanceMode( USE_PARENT_POSITION ); + mParent.SetParentOrigin( ParentOrigin::CENTER ); mContent.Add( mParent ); // show the first image mCurrentImage = Toolkit::ImageView::New( LoadStageFillingImage( IMAGES[mIndex] ) ); - mCurrentImage.SetPositionInheritanceMode(USE_PARENT_POSITION_PLUS_LOCAL_POSITION); + mCurrentImage.SetParentOrigin( ParentOrigin::CENTER ); mCurrentImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); mCurrentImage.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO ); mParent.Add( mCurrentImage ); @@ -293,7 +293,7 @@ void DissolveEffectApp::OnPanGesture( Actor actor, const PanGesture& gesture ) Image image = LoadStageFillingImage( IMAGES[ mIndex ] ); mNextImage = Toolkit::ImageView::New( image ); - mNextImage.SetPositionInheritanceMode(USE_PARENT_POSITION_PLUS_LOCAL_POSITION); + mNextImage.SetParentOrigin( ParentOrigin::CENTER ); mNextImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); mNextImage.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO ); mNextImage.SetZ(INITIAL_DEPTH); @@ -406,7 +406,7 @@ bool DissolveEffectApp::OnTimerTick() mIndex = (mIndex + 1)%NUM_IMAGES; Image image = LoadStageFillingImage( IMAGES[ mIndex ] ); mNextImage = Toolkit::ImageView::New( image ); - mNextImage.SetPositionInheritanceMode(USE_PARENT_POSITION_PLUS_LOCAL_POSITION); + mNextImage.SetParentOrigin( ParentOrigin::CENTER ); mNextImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); mNextImage.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO ); mNextImage.SetZ(INITIAL_DEPTH); diff --git a/examples/radial-menu/radial-menu-example.cpp b/examples/radial-menu/radial-menu-example.cpp index 142523f..3454125 100644 --- a/examples/radial-menu/radial-menu-example.cpp +++ b/examples/radial-menu/radial-menu-example.cpp @@ -175,12 +175,12 @@ void RadialMenuExample::OnInit(Application& app) Image dial = ResourceImage::New( TEST_DIAL_FILENAME ); mDialView = ImageView::New( dial ); mDialView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); - mDialView.SetPositionInheritanceMode(USE_PARENT_POSITION); + mDialView.SetParentOrigin( ParentOrigin::CENTER ); mDialView.SetScale(scale); Layer dialLayer = Layer::New(); dialLayer.Add( mDialView ); - dialLayer.SetPositionInheritanceMode(USE_PARENT_POSITION); + dialLayer.SetParentOrigin( ParentOrigin::CENTER ); dialLayer.SetSize(stage.GetSize()); mContents.Add(dialLayer); @@ -271,10 +271,10 @@ RadialSweepView RadialMenuExample::CreateSweepView( std::string imageName, radialSweepView.SetFinalSector( Degree(359.999f) ); radialSweepView.SetSize( Stage::GetCurrent().GetSize()); radialSweepView.SetEasingFunction( Dali::AlphaFunction::EASE_IN_OUT ); - radialSweepView.SetPositionInheritanceMode(USE_PARENT_POSITION); + radialSweepView.SetParentOrigin( ParentOrigin::CENTER ); mContents.Add(radialSweepView); radialSweepView.Add( mImageView ); - mImageView.SetPositionInheritanceMode(USE_PARENT_POSITION); + mImageView.SetParentOrigin( ParentOrigin::CENTER ); return radialSweepView; } diff --git a/examples/radial-menu/radial-sweep-view-impl.cpp b/examples/radial-menu/radial-sweep-view-impl.cpp index 9c791c7..b83e9f3 100644 --- a/examples/radial-menu/radial-sweep-view-impl.cpp +++ b/examples/radial-menu/radial-sweep-view-impl.cpp @@ -223,7 +223,7 @@ void RadialSweepViewImpl::Add(Actor actor) mLayer = Layer::New(); Self().Add(mLayer); mLayer.SetSize( Stage::GetCurrent().GetSize() ); - mLayer.SetPositionInheritanceMode(USE_PARENT_POSITION); + mLayer.SetParentOrigin( ParentOrigin::CENTER ); } mLayer.Add(actor); @@ -362,5 +362,5 @@ void RadialSweepViewImpl::CreateStencil( Radian initialSector ) mRotationAngleIndex = mStencilActor.RegisterProperty("uRotationAngle", initialSector.radian); mStencilActor.SetDrawMode( DrawMode::STENCIL ); - mStencilActor.SetPositionInheritanceMode(USE_PARENT_POSITION); + mStencilActor.SetParentOrigin( ParentOrigin::CENTER ); } -- 2.7.4