X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ScrollViewEffect.cpp;h=5cda4972adb04bf22aac8481e733b598f1ddff65;hp=e10107b313c9de4da339c72b6544919d8066953f;hb=834ddf7832598a57fc18c282371554a1ed8f0a78;hpb=c8ffcb9f46ded14981915479af62d85970798db5 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp index e10107b..5cda497 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp @@ -141,7 +141,7 @@ ScrollView SetupTestScrollView(int rows, int columns, Vector2 size) scrollView.SetSize(size); scrollView.SetAnchorPoint(AnchorPoint::CENTER); scrollView.SetParentOrigin(ParentOrigin::CENTER); - scrollView.ApplyConstraint( Constraint::New( Dali::Actor::Property::Size, Dali::ParentSource( Dali::Actor::Property::Size ), Dali::EqualToConstraint() ) ); + scrollView.ApplyConstraint( Constraint::New( Dali::Actor::Property::SIZE, Dali::ParentSource( Dali::Actor::Property::SIZE ), Dali::EqualToConstraint() ) ); scrollView.SetWrapMode(false); scrollView.ScrollStartedSignal().Connect( &OnScrollStart ); scrollView.ScrollUpdatedSignal().Connect( &OnScrollUpdate ); @@ -175,7 +175,7 @@ ScrollView SetupTestScrollView(int rows, int columns, Vector2 size) container.SetAnchorPoint(AnchorPoint::CENTER); container.SetSize( size ); scrollView.Add( container ); - container.ApplyConstraint( Constraint::New( Actor::Property::Size, ParentSource( Actor::Property::Size ), EqualToConstraint() ) ); + container.ApplyConstraint( Constraint::New( Actor::Property::SIZE, ParentSource( Actor::Property::SIZE ), EqualToConstraint() ) ); gPages.clear(); for(int row = 0;row( Actor::Property::Size, ParentSource( Actor::Property::Size ), EqualToConstraint() ) ); + page.ApplyConstraint( Constraint::New( Actor::Property::SIZE, ParentSource( Actor::Property::SIZE ), EqualToConstraint() ) ); page.SetParentOrigin( ParentOrigin::CENTER ); page.SetAnchorPoint( AnchorPoint::CENTER ); page.SetPosition( column * size.x, row * size.y ); @@ -322,7 +322,7 @@ int UtcDaliScrollViewSpiralEffectTest(void) { Actor page = *pageIter; page.RemoveConstraints(); - page.ApplyConstraint( Constraint::New( Actor::Property::Size, ParentSource( Actor::Property::Size ), EqualToConstraint() ) ); + page.ApplyConstraint( Constraint::New( Actor::Property::SIZE, ParentSource( Actor::Property::SIZE ), EqualToConstraint() ) ); effect.ApplyToPage(page, Vector2(Math::PI_2, 0.0f)); } Wait(application); @@ -431,7 +431,7 @@ int UtcDaliScrollViewPageCubeEffectTest(void) { Actor page = *pageIter; page.RemoveConstraints(); - page.ApplyConstraint( Constraint::New( Actor::Property::Size, ParentSource( Actor::Property::Size ), EqualToConstraint() ) ); + page.ApplyConstraint( Constraint::New( Actor::Property::SIZE, ParentSource( Actor::Property::SIZE ), EqualToConstraint() ) ); effect.ApplyToPage(page, Vector2(Math::PI_2, 0.0f)); } Wait(application); @@ -466,7 +466,7 @@ int UtcDaliScrollViewPageCarouselEffectTest(void) { Actor page = *pageIter; page.RemoveConstraints(); - page.ApplyConstraint( Constraint::New( Actor::Property::Size, ParentSource( Actor::Property::Size ), EqualToConstraint() ) ); + page.ApplyConstraint( Constraint::New( Actor::Property::SIZE, ParentSource( Actor::Property::SIZE ), EqualToConstraint() ) ); effect.ApplyToPage(page); } Wait(application);