ScrollView scrollView = ScrollView::New();
// Do not rely on stage size for UTC tests.
- Vector2 pageSize( 720.0f, 1280.0f );
+ Vector2 viewPageSize( 720.0f, 1280.0f );
scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
- scrollView.SetSize( pageSize );
- scrollView.SetParentOrigin( ParentOrigin::CENTER );
- scrollView.SetAnchorPoint( AnchorPoint::CENTER );
- scrollView.SetPosition( 0.0f, 0.0f, 0.0f );
+ scrollView.SetProperty( Actor::Property::SIZE, viewPageSize );
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+ scrollView.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f ));
// Position rulers.
Property::Map rulerMap;
rulerMap.Add( ScrollMode::X_AXIS_SCROLL_ENABLED, true );
- rulerMap.Add( ScrollMode::X_AXIS_SNAP_TO_INTERVAL, pageSize.width );
- rulerMap.Add( ScrollMode::X_AXIS_SCROLL_BOUNDARY, pageSize.width*3 );
+ rulerMap.Add( ScrollMode::X_AXIS_SNAP_TO_INTERVAL, viewPageSize.width );
+ rulerMap.Add( ScrollMode::X_AXIS_SCROLL_BOUNDARY, viewPageSize.width*3 );
rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_ENABLED, false );
scrollView.SetProperty( ScrollView::Property::SCROLL_MODE, rulerMap);
Vector2 currentPos( PerformGestureSwipe( application, startPos, direction, frames - 1, time, false ) );
// Confirm the final X coord has not moved more than one page from the start X position.
- DALI_TEST_GREATER( ( startPos.x + pageSize.width ), scrollView.GetCurrentScrollPosition().x, TEST_LOCATION );
+ DALI_TEST_GREATER( ( startPos.x + viewPageSize.width ), scrollView.GetCurrentScrollPosition().x, TEST_LOCATION );
// Finish the gesture and wait for the snap.
currentPos += direction;
time += Wait( application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL );
// Confirm the final X coord has snapped to exactly one page ahead of the start page.
- DALI_TEST_EQUALS( pageSize.width, scrollView.GetCurrentScrollPosition().x, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+ DALI_TEST_EQUALS( viewPageSize.width, scrollView.GetCurrentScrollPosition().x, Math::MACHINE_EPSILON_0, TEST_LOCATION );
END_TEST;
}
ScrollView scrollView = ScrollView::New();
// Do not rely on stage size for UTC tests.
- Vector2 pageSize( 720.0f, 1280.0f );
+ Vector2 viewPageSize( 720.0f, 1280.0f );
scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
- scrollView.SetSize( pageSize );
- scrollView.SetParentOrigin( ParentOrigin::CENTER );
- scrollView.SetAnchorPoint( AnchorPoint::CENTER );
- scrollView.SetPosition( 0.0f, 0.0f, 0.0f );
+ scrollView.SetProperty( Actor::Property::SIZE, viewPageSize );
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+ scrollView.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f ));
// Position rulers.
Property::Map rulerMap;
rulerMap.Add( ScrollMode::X_AXIS_SCROLL_ENABLED, false );
rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_ENABLED, true );
- rulerMap.Add( ScrollMode::Y_AXIS_SNAP_TO_INTERVAL, pageSize.height );
- rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_BOUNDARY, pageSize.height*3 );
+ rulerMap.Add( ScrollMode::Y_AXIS_SNAP_TO_INTERVAL, viewPageSize.height );
+ rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_BOUNDARY, viewPageSize.height*3 );
scrollView.SetProperty( ScrollView::Property::SCROLL_MODE, rulerMap);
scrollView.SetWrapMode( false );
Vector2 currentPos( PerformGestureSwipe( application, startPos, direction, frames - 1, time, false ) );
// Confirm the final X coord has not moved more than one page from the start X position.
- DALI_TEST_GREATER( ( startPos.y + pageSize.height ), scrollView.GetCurrentScrollPosition().y, TEST_LOCATION );
+ DALI_TEST_GREATER( ( startPos.y + viewPageSize.height ), scrollView.GetCurrentScrollPosition().y, TEST_LOCATION );
// Finish the gesture and wait for the snap.
currentPos += direction;
Wait( application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL );
// Confirm the final Y coord has snapped to exactly one page ahead of the start page.
- DALI_TEST_EQUALS( pageSize.height, scrollView.GetCurrentScrollPosition().y, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+ DALI_TEST_EQUALS( viewPageSize.height, scrollView.GetCurrentScrollPosition().y, Math::MACHINE_EPSILON_0, TEST_LOCATION );
END_TEST;
}
ScrollView scrollView = ScrollView::New();
// Do not rely on stage size for UTC tests.
- Vector2 pageSize( 720.0f, 1280.0f );
+ Vector2 viewPageSize( 720.0f, 1280.0f );
scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
- scrollView.SetSize( pageSize );
- scrollView.SetParentOrigin( ParentOrigin::CENTER );
- scrollView.SetAnchorPoint( AnchorPoint::CENTER );
- scrollView.SetPosition( 0.0f, 0.0f, 0.0f );
+ scrollView.SetProperty( Actor::Property::SIZE, viewPageSize );
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+ scrollView.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f ));
// Position rulers.
Property::Map rulerMap;
rulerMap.Add( ScrollMode::X_AXIS_SCROLL_ENABLED, false );
rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_ENABLED, true );
- rulerMap.Add( ScrollMode::Y_AXIS_SNAP_TO_INTERVAL, pageSize.height );
- rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_BOUNDARY, pageSize.height*3 );
+ rulerMap.Add( ScrollMode::Y_AXIS_SNAP_TO_INTERVAL, viewPageSize.height );
+ rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_BOUNDARY, viewPageSize.height*3 );
scrollView.SetProperty( ScrollView::Property::SCROLL_MODE, rulerMap);
scrollView.SetWrapMode( false );
Vector2 currentPos( PerformGestureSwipe( application, startPos, direction, frames - 1, time, false ) );
// Confirm the final X coord has not moved more than one page from the start X position.
- DALI_TEST_GREATER( ( startPos.y + pageSize.height ), scrollView.GetCurrentScrollPosition().y, TEST_LOCATION );
+ DALI_TEST_GREATER( ( startPos.y + viewPageSize.height ), scrollView.GetCurrentScrollPosition().y, TEST_LOCATION );
// Finish the gesture and wait for the snap.
currentPos += direction;
Wait( application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL );
// Confirm the final Y coord has snapped to exactly one page ahead of the start page.
- DALI_TEST_EQUALS( pageSize.height, scrollView.GetCurrentScrollPosition().y, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+ DALI_TEST_EQUALS( viewPageSize.height, scrollView.GetCurrentScrollPosition().y, Math::MACHINE_EPSILON_0, TEST_LOCATION );
END_TEST;
}
ScrollView scrollView = ScrollView::New();
// Do not rely on stage size for UTC tests.
- Vector2 pageSize( 720.0f, 1280.0f );
+ Vector2 viewPageSize( 720.0f, 1280.0f );
scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
- scrollView.SetSize( pageSize );
- scrollView.SetParentOrigin( ParentOrigin::TOP_LEFT );
- scrollView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- scrollView.SetPosition( 0.0f, 0.0f, 0.0f );
+ scrollView.SetProperty( Actor::Property::SIZE, viewPageSize );
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+ scrollView.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f ));
// Position rulers - expect Default rulers to be used which don't snap
Property::Map rulerMap;
Actor actorA = Actor::New();
const Vector3 positionA = Vector3(100.0f, 400.0f, 0.0f);
- actorA.SetPosition(positionA);
+ actorA.SetProperty( Actor::Property::POSITION, positionA );
scrollView.Add(actorA);
Actor actorB = Actor::New();
const Vector3 positionB = Vector3(500.0f, 200.0f, 0.0f);
- actorB.SetPosition(positionB);
+ actorB.SetProperty( Actor::Property::POSITION, positionB );
scrollView.Add(actorB);
Wait(application);
const Vector3 aPosition = Vector3(200.0f, 50.0f, 0.0f);
Actor a = Actor::New();
scrollView.Add(a);
- a.SetPosition(aPosition);
+ a.SetProperty( Actor::Property::POSITION, aPosition );
const Vector3 bPosition = Vector3(600.0f, 600.0f, 0.0f);
Actor b = Actor::New();
scrollView.Add(b);
- b.SetPosition(bPosition);
+ b.SetProperty( Actor::Property::POSITION, bPosition );
// Goto a random position, and execute snap (should not move)
Vector2 targetScroll = Vector2(500.0f, 500.0f);
ScrollView scrollView = ScrollView::New();
Stage::GetCurrent().Add( scrollView );
Vector2 stageSize = Stage::GetCurrent().GetSize();
- scrollView.SetSize(stageSize);
- scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT);
- scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::SIZE, stageSize);
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
// Position rulers.
RulerPtr rulerX = new DefaultRuler();
scrollView.ScrollCompletedSignal().Connect( &OnScrollComplete );
Actor image = Actor::New();
- image.SetSize(stageSize);
- image.SetParentOrigin(ParentOrigin::TOP_LEFT);
- image.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ image.SetProperty( Actor::Property::SIZE, stageSize);
+ image.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ image.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
scrollView.Add(image);
Wait(application);
ScrollView scrollView = ScrollView::New();
Stage::GetCurrent().Add( scrollView );
Vector2 stageSize = Stage::GetCurrent().GetSize();
- scrollView.SetSize(stageSize);
- scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT);
- scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::SIZE, stageSize);
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
// Position rulers.
RulerPtr rulerX = new DefaultRuler();
DALI_TEST_CHECK(scrollView.ConnectSignal( &tracker, "scrollCompleted", CallbackFunctor(&scrollCompleted) ));
Actor image = Actor::New();
- image.SetSize(stageSize);
- image.SetParentOrigin(ParentOrigin::TOP_LEFT);
- image.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ image.SetProperty( Actor::Property::SIZE, stageSize);
+ image.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ image.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
scrollView.Add(image);
Wait(application);
scrollView.SetOvershootEnabled(true);
Stage::GetCurrent().Add( scrollView );
Vector2 stageSize = Stage::GetCurrent().GetSize();
- scrollView.SetSize(stageSize);
- scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT);
- scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::SIZE, stageSize);
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
// Position rulers.
RulerPtr rulerX = new DefaultRuler();
ScrollView scrollView = ScrollView::New();
Stage::GetCurrent().Add( scrollView );
Vector2 stageSize = Stage::GetCurrent().GetSize();
- scrollView.SetSize(stageSize);
- scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT);
- scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::SIZE, stageSize);
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
// Position rulers.
RulerPtr rulerX = new DefaultRuler();
ScrollView scrollView = ScrollView::New();
Stage::GetCurrent().Add( scrollView );
Vector2 stageSize = Stage::GetCurrent().GetSize();
- scrollView.SetSize(stageSize);
- scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT);
- scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::SIZE, stageSize);
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
// Position rulers.
RulerPtr rulerX = new DefaultRuler();
gConstraintResult = Vector3::ZERO;
Actor a = Actor::New();
scrollView.Add(a);
- a.SetPosition( TEST_ACTOR_POSITION );
+ a.SetProperty( Actor::Property::POSITION, TEST_ACTOR_POSITION);
Wait(application);
Constraint constraint = Constraint::New<Vector3>( scrollView, Actor::Property::POSITION, TestSumConstraint( TEST_CONSTRAINT_OFFSET ) );
ScrollView scrollView = ScrollView::New();
Stage::GetCurrent().Add( scrollView );
Vector2 stageSize = Stage::GetCurrent().GetSize();
- scrollView.SetSize(stageSize);
- scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT);
- scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::SIZE, stageSize);
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
// Position rulers.
RulerPtr rulerX = new DefaultRuler();
gConstraintResult = Vector3::ZERO;
Actor a = Actor::New();
scrollView.Add(a);
- a.SetPosition( TEST_ACTOR_POSITION );
+ a.SetProperty( Actor::Property::POSITION, TEST_ACTOR_POSITION);
Wait(application);
// apply this constraint to scrollview
Stage::GetCurrent().Add( scrollView );
Vector2 stageSize = Stage::GetCurrent().GetSize();
- scrollView.SetSize(stageSize);
- scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT);
- scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::SIZE, stageSize);
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
// Position rulers.
RulerPtr rulerX = new DefaultRuler();
ScrollView scrollView = ScrollView::New();
Stage::GetCurrent().Add( scrollView );
Vector2 stageSize = Stage::GetCurrent().GetSize();
- scrollView.SetSize(stageSize);
- scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT);
- scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::SIZE, stageSize);
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
// Position rulers.
RulerPtr rulerX = new DefaultRuler();
ScrollView scrollView = ScrollView::New();
Stage::GetCurrent().Add( scrollView );
Vector2 stageSize = Stage::GetCurrent().GetSize();
- scrollView.SetSize(stageSize);
- scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT);
- scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::SIZE, stageSize);
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
// Position rulers.
RulerPtr rulerX = new DefaultRuler();
ScrollView scrollView = ScrollView::New();
Stage::GetCurrent().Add( scrollView );
Vector2 stageSize = Stage::GetCurrent().GetSize();
- scrollView.SetSize(stageSize);
- scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT);
- scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::SIZE, stageSize);
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
Vector2 START_POSITION = Vector2(10.0f, 10.0f);
ScrollView scrollView = ScrollView::New();
Stage::GetCurrent().Add( scrollView );
Vector2 stageSize = Stage::GetCurrent().GetSize();
- scrollView.SetSize(stageSize);
- scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT);
- scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::SIZE, stageSize);
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
Vector2 START_POSITION = Vector2(10.0f, 10.0f);
uint32_t time = 0;
ScrollView scrollView = ScrollView::New();
Stage::GetCurrent().Add( scrollView );
Vector2 stageSize = Stage::GetCurrent().GetSize();
- scrollView.SetSize(stageSize);
- scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT);
- scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::SIZE, stageSize);
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
// Position rulers.
RulerPtr rulerX = new DefaultRuler();
// Add an Actor to ScrollView,
Actor a = Actor::New();
scrollView.Add(a);
- a.SetPosition( TEST_ACTOR_POSITION );
+ a.SetProperty( Actor::Property::POSITION, TEST_ACTOR_POSITION);
Wait(application);
const Vector2 target = Vector2(100.0f, 100.0f);
ScrollView scrollView = ScrollView::New();
Stage::GetCurrent().Add( scrollView );
Vector2 stageSize = Stage::GetCurrent().GetSize();
- scrollView.SetSize(stageSize);
- scrollView.SetParentOrigin(ParentOrigin::TOP_LEFT);
- scrollView.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::SIZE, stageSize);
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
// Position rulers.
RulerPtr rulerX = new DefaultRuler();
// Add an Actor to ScrollView,
Actor a = Actor::New();
scrollView.Add(a);
- a.SetPosition( TEST_ACTOR_POSITION );
+ a.SetProperty( Actor::Property::POSITION, TEST_ACTOR_POSITION);
Wait(application);
const Vector2 target = Vector2(100.0f, 100.0f);
ScrollView scrollView = ScrollView::New();
// Do not rely on stage size for UTC tests.
- Vector2 pageSize( 720.0f, 1280.0f );
+ Vector2 viewPageSize( 720.0f, 1280.0f );
scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
- scrollView.SetSize( pageSize );
- scrollView.SetParentOrigin( ParentOrigin::CENTER );
- scrollView.SetAnchorPoint( AnchorPoint::CENTER );
- scrollView.SetPosition( 0.0f, 0.0f, 0.0f );
+ scrollView.SetProperty( Actor::Property::SIZE, viewPageSize );
+ scrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+ scrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+ scrollView.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f ));
// Position rulers.
// We set the X ruler to fixed to give us pages to snap to.
- Dali::Toolkit::FixedRuler* rulerX = new Dali::Toolkit::FixedRuler( pageSize.width );
+ Dali::Toolkit::FixedRuler* rulerX = new Dali::Toolkit::FixedRuler( viewPageSize.width );
// Note: The 3x page width is arbitary, but we need enough to show that we are
// capping page movement by the page limiter, and not the domain.
- rulerX->SetDomain( Dali::Toolkit::RulerDomain( 0.0f, pageSize.width * 3.0f, false ) );
+ rulerX->SetDomain( Dali::Toolkit::RulerDomain( 0.0f, viewPageSize.width * 3.0f, false ) );
Dali::Toolkit::RulerPtr rulerY = new Dali::Toolkit::DefaultRuler();
rulerY->Disable();
scrollView.SetRulerX( rulerX );
Vector2 currentPos( PerformGestureSwipe( application, startPos, direction, frames - 1, time, false ) );
// Confirm the final X coord has not moved more than one page from the start X position.
- DALI_TEST_GREATER( ( startPos.x + pageSize.width ), scrollView.GetCurrentScrollPosition().x, TEST_LOCATION );
+ DALI_TEST_GREATER( ( startPos.x + viewPageSize.width ), scrollView.GetCurrentScrollPosition().x, TEST_LOCATION );
// Finish the gesture and wait for the snap.
currentPos += direction;
time += Wait( application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL );
// Confirm the final X coord has snapped to exactly one page ahead of the start page.
- DALI_TEST_EQUALS( pageSize.width, scrollView.GetCurrentScrollPosition().x, Math::MACHINE_EPSILON_0, TEST_LOCATION );
+ DALI_TEST_EQUALS( viewPageSize.width, scrollView.GetCurrentScrollPosition().x, Math::MACHINE_EPSILON_0, TEST_LOCATION );
END_TEST;
}