Peter M. Groen / dali-demo

Commit 9cf6410e88ddcab2c0a134846a77b8e670fd6398

Authored by Ferran Sole
1 parent 9fa77330

Changes following deprecation of position inheritance modes 

Change-Id: Ia04c81329062610182df63da05b58def4c3d927f
Inline Side-by-side
Showing 4 changed files with 13 additions and 13 deletions
examples/cube-transition-effect/cube-transition-effect-example.cpp
  View file @9cf6410
... ... @@ -260,7 +260,7 @@ void CubeTransitionApp::OnInit( Application& application )
260 260 mCubeWaveEffect.TransitionCompletedSignal().Connect(this, &CubeTransitionApp::OnTransitionCompleted);
261 261  
262 262 mCubeWaveEffect.SetSize( mViewSize );
263   - mCubeWaveEffect.SetPositionInheritanceMode( USE_PARENT_POSITION );
  263 + mCubeWaveEffect.SetParentOrigin( ParentOrigin::CENTER );
264 264 mCubeWaveEffect.SetCurrentImage( mCurrentImage );
265 265  
266 266 // use big cubes
... ... @@ -270,7 +270,7 @@ void CubeTransitionApp::OnInit( Application& application )
270 270 mCubeCrossEffect.TransitionCompletedSignal().Connect(this, &CubeTransitionApp::OnTransitionCompleted);
271 271  
272 272 mCubeCrossEffect.SetSize( mViewSize );
273   - mCubeCrossEffect.SetPositionInheritanceMode( USE_PARENT_POSITION );
  273 + mCubeCrossEffect.SetParentOrigin( ParentOrigin::CENTER );
274 274 mCubeCrossEffect.SetCurrentImage( mCurrentImage );
275 275  
276 276 mCubeFoldEffect = Toolkit::CubeTransitionFoldEffect::New( NUM_ROWS_FOLD, NUM_COLUMNS_FOLD );
... ... @@ -278,7 +278,7 @@ void CubeTransitionApp::OnInit( Application& application )
278 278 mCubeFoldEffect.TransitionCompletedSignal().Connect(this, &CubeTransitionApp::OnTransitionCompleted);
279 279  
280 280 mCubeFoldEffect.SetSize( mViewSize );
281   - mCubeFoldEffect.SetPositionInheritanceMode( USE_PARENT_POSITION );
  281 + mCubeFoldEffect.SetParentOrigin( ParentOrigin::CENTER );
282 282 mCubeFoldEffect.SetCurrentImage( mCurrentImage );
283 283  
284 284 mViewTimer = Timer::New( VIEWINGTIME );
... ...
examples/dissolve-effect/dissolve-effect-example.cpp
  View file @9cf6410
... ... @@ -255,12 +255,12 @@ void DissolveEffectApp::OnInit( Application& application )
255 255 // Set size to stage size to avoid seeing a black border on transition
256 256 mParent = Actor::New();
257 257 mParent.SetSize( Stage::GetCurrent().GetSize() );
258   - mParent.SetPositionInheritanceMode( USE_PARENT_POSITION );
  258 + mParent.SetParentOrigin( ParentOrigin::CENTER );
259 259 mContent.Add( mParent );
260 260  
261 261 // show the first image
262 262 mCurrentImage = Toolkit::ImageView::New( LoadStageFillingImage( IMAGES[mIndex] ) );
263   - mCurrentImage.SetPositionInheritanceMode(USE_PARENT_POSITION_PLUS_LOCAL_POSITION);
  263 + mCurrentImage.SetParentOrigin( ParentOrigin::CENTER );
264 264 mCurrentImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
265 265 mCurrentImage.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
266 266 mParent.Add( mCurrentImage );
... ... @@ -293,7 +293,7 @@ void DissolveEffectApp::OnPanGesture( Actor actor, const PanGesture& gesture )
293 293  
294 294 Image image = LoadStageFillingImage( IMAGES[ mIndex ] );
295 295 mNextImage = Toolkit::ImageView::New( image );
296   - mNextImage.SetPositionInheritanceMode(USE_PARENT_POSITION_PLUS_LOCAL_POSITION);
  296 + mNextImage.SetParentOrigin( ParentOrigin::CENTER );
297 297 mNextImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
298 298 mNextImage.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
299 299 mNextImage.SetZ(INITIAL_DEPTH);
... ... @@ -406,7 +406,7 @@ bool DissolveEffectApp::OnTimerTick()
406 406 mIndex = (mIndex + 1)%NUM_IMAGES;
407 407 Image image = LoadStageFillingImage( IMAGES[ mIndex ] );
408 408 mNextImage = Toolkit::ImageView::New( image );
409   - mNextImage.SetPositionInheritanceMode(USE_PARENT_POSITION_PLUS_LOCAL_POSITION);
  409 + mNextImage.SetParentOrigin( ParentOrigin::CENTER );
410 410 mNextImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
411 411 mNextImage.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
412 412 mNextImage.SetZ(INITIAL_DEPTH);
... ...
examples/radial-menu/radial-menu-example.cpp
  View file @9cf6410
... ... @@ -175,12 +175,12 @@ void RadialMenuExample::OnInit(Application& app)
175 175 Image dial = ResourceImage::New( TEST_DIAL_FILENAME );
176 176 mDialView = ImageView::New( dial );
177 177 mDialView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
178   - mDialView.SetPositionInheritanceMode(USE_PARENT_POSITION);
  178 + mDialView.SetParentOrigin( ParentOrigin::CENTER );
179 179 mDialView.SetScale(scale);
180 180 Layer dialLayer = Layer::New();
181 181  
182 182 dialLayer.Add( mDialView );
183   - dialLayer.SetPositionInheritanceMode(USE_PARENT_POSITION);
  183 + dialLayer.SetParentOrigin( ParentOrigin::CENTER );
184 184 dialLayer.SetSize(stage.GetSize());
185 185 mContents.Add(dialLayer);
186 186  
... ... @@ -271,10 +271,10 @@ RadialSweepView RadialMenuExample::CreateSweepView( std::string imageName,
271 271 radialSweepView.SetFinalSector( Degree(359.999f) );
272 272 radialSweepView.SetSize( Stage::GetCurrent().GetSize());
273 273 radialSweepView.SetEasingFunction( Dali::AlphaFunction::EASE_IN_OUT );
274   - radialSweepView.SetPositionInheritanceMode(USE_PARENT_POSITION);
  274 + radialSweepView.SetParentOrigin( ParentOrigin::CENTER );
275 275 mContents.Add(radialSweepView);
276 276 radialSweepView.Add( mImageView );
277   - mImageView.SetPositionInheritanceMode(USE_PARENT_POSITION);
  277 + mImageView.SetParentOrigin( ParentOrigin::CENTER );
278 278  
279 279 return radialSweepView;
280 280 }
... ...
examples/radial-menu/radial-sweep-view-impl.cpp
  View file @9cf6410
... ... @@ -223,7 +223,7 @@ void RadialSweepViewImpl::Add(Actor actor)
223 223 mLayer = Layer::New();
224 224 Self().Add(mLayer);
225 225 mLayer.SetSize( Stage::GetCurrent().GetSize() );
226   - mLayer.SetPositionInheritanceMode(USE_PARENT_POSITION);
  226 + mLayer.SetParentOrigin( ParentOrigin::CENTER );
227 227 }
228 228  
229 229 mLayer.Add(actor);
... ... @@ -362,5 +362,5 @@ void RadialSweepViewImpl::CreateStencil( Radian initialSector )
362 362 mRotationAngleIndex = mStencilActor.RegisterProperty("uRotationAngle", initialSector.radian);
363 363  
364 364 mStencilActor.SetDrawMode( DrawMode::STENCIL );
365   - mStencilActor.SetPositionInheritanceMode(USE_PARENT_POSITION);
  365 + mStencilActor.SetParentOrigin( ParentOrigin::CENTER );
366 366 }
... ...