Rename PAGE_SIZE property to VIEW_PAGE_SIZE to avoid clash with PAGE_SIZE macro.

Change-Id: I847369004332b3aac03060da39d84b1f9b284293

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
index 1607611..24c5d09 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
@@ -33,7 +33,7 @@ namespace
 {
 const int RENDER_FRAME_INTERVAL = 16;                           ///< Duration of each frame in ms. (at approx 60FPS)
 const unsigned int TOTAL_PAGE_NUMBER = 20;
 {
 const int RENDER_FRAME_INTERVAL = 16;                           ///< Duration of each frame in ms. (at approx 60FPS)
 const unsigned int TOTAL_PAGE_NUMBER = 20;

-const Vector2 PAGE_SIZE( 300.f,400.f );
+const Vector2 VIEW_PAGE_SIZE( 300.f,400.f );

 const Vector2 SPINE_SHADOW_PARAMETER( 60.0f, 30.0f );
 
 static bool gObjectCreatedCallBackCalled;
 const Vector2 SPINE_SHADOW_PARAMETER( 60.0f, 30.0f );
 
 static bool gObjectCreatedCallBackCalled;


@@ -208,7 +208,7 @@ int UtcDaliPageTurnPortraitViewNew(void)
 
   // Test object creation
   TestPageFactory factory;
 
   // Test object creation
   TestPageFactory factory;

-  portraitView = PageTurnPortraitView::New( factory, PAGE_SIZE );
+  portraitView = PageTurnPortraitView::New( factory, VIEW_PAGE_SIZE );

   DALI_TEST_CHECK( portraitView );
 
   //Additional check to ensure object is created by checking if it's registered
   DALI_TEST_CHECK( portraitView );
 
   //Additional check to ensure object is created by checking if it's registered


@@ -219,7 +219,7 @@ int UtcDaliPageTurnPortraitViewNew(void)
   registry.ObjectCreatedSignal().Connect( &TestCallback );
   {
     TestPageFactory factory;
   registry.ObjectCreatedSignal().Connect( &TestCallback );
   {
     TestPageFactory factory;

-    PageTurnView portraitView = PageTurnPortraitView::New( factory, PAGE_SIZE );
+    PageTurnView portraitView = PageTurnPortraitView::New( factory, VIEW_PAGE_SIZE );

   }
   DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
 
   }
   DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
 


@@ -248,7 +248,7 @@ int UtcDaliPageTurnLandscapeViewNew(void)
 
   // Test object creation
   TestPageFactory factory;
 
   // Test object creation
   TestPageFactory factory;

-  landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE );
+  landscapeView = PageTurnLandscapeView::New( factory, VIEW_PAGE_SIZE );

   DALI_TEST_CHECK( landscapeView );
 
   //Additional check to ensure object is created by checking if it's registered
   DALI_TEST_CHECK( landscapeView );
 
   //Additional check to ensure object is created by checking if it's registered


@@ -259,7 +259,7 @@ int UtcDaliPageTurnLandscapeViewNew(void)
   registry.ObjectCreatedSignal().Connect( &TestCallback );
   {
     TestPageFactory factory;
   registry.ObjectCreatedSignal().Connect( &TestCallback );
   {
     TestPageFactory factory;

-    PageTurnView landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE );
+    PageTurnView landscapeView = PageTurnLandscapeView::New( factory, VIEW_PAGE_SIZE );

   }
   DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
 
   }
   DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
 


@@ -288,7 +288,7 @@ int UtcDaliPageTurnPortraitViewCopyConstructorAndAssignment(void)
 
   // Test object creation
   TestPageFactory factory;
 
   // Test object creation
   TestPageFactory factory;

-  portraitView = PageTurnPortraitView::New( factory, PAGE_SIZE );
+  portraitView = PageTurnPortraitView::New( factory, VIEW_PAGE_SIZE );

   DALI_TEST_CHECK( portraitView );
 
   // Test copy constructor
   DALI_TEST_CHECK( portraitView );
 
   // Test copy constructor


@@ -322,7 +322,7 @@ int UtcDaliPageTurnLandscapeViewCopyConstructorAndAssignment(void)
 
   // Test object creation
   TestPageFactory factory;
 
   // Test object creation
   TestPageFactory factory;

-  landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE );
+  landscapeView = PageTurnLandscapeView::New( factory, VIEW_PAGE_SIZE );

   DALI_TEST_CHECK( landscapeView );
 
   // Test copy constructor
   DALI_TEST_CHECK( landscapeView );
 
   // Test copy constructor


@@ -351,23 +351,23 @@ int UtcDaliPageTurnViewSetGetProperty(void)
   tet_infoline(" UtcDaliPageTurnViewSetGetProperty ");
 
   TestPageFactory factory;
   tet_infoline(" UtcDaliPageTurnViewSetGetProperty ");
 
   TestPageFactory factory;

-  PageTurnView landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE );
+  PageTurnView landscapeView = PageTurnLandscapeView::New( factory, VIEW_PAGE_SIZE );

   DALI_TEST_CHECK( landscapeView );
 
   Stage::GetCurrent().Add( landscapeView );
 
   DALI_TEST_CHECK( landscapeView );
 
   Stage::GetCurrent().Add( landscapeView );
 

-  // Test "pageSize" property
-  DALI_TEST_CHECK( landscapeView.GetPropertyIndex("pageSize") == PageTurnView::Property::PAGE_SIZE  );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::PAGE_SIZE).Get<Vector2>(), PAGE_SIZE, TEST_LOCATION );
+  // Test "viewPageSize" property
+  DALI_TEST_CHECK( landscapeView.GetPropertyIndex("viewPageSize") == PageTurnView::Property::VIEW_PAGE_SIZE  );
+  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), VIEW_PAGE_SIZE, TEST_LOCATION );

 
 

-  Vector2 newSize( PAGE_SIZE.x*0.75, PAGE_SIZE.y*0.5f );
-  landscapeView.SetProperty( PageTurnView::Property::PAGE_SIZE, newSize );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::PAGE_SIZE).Get<Vector2>(), newSize, TEST_LOCATION );
+  Vector2 newSize( VIEW_PAGE_SIZE.x*0.75, VIEW_PAGE_SIZE.y*0.5f );
+  landscapeView.SetProperty( PageTurnView::Property::VIEW_PAGE_SIZE, newSize );
+  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), newSize, TEST_LOCATION );

   Wait( application);
   DALI_TEST_EQUALS( Vector2(landscapeView.GetTargetSize()), Vector2(newSize.x*2.f, newSize.y), TEST_LOCATION);
 
   Wait( application);
   DALI_TEST_EQUALS( Vector2(landscapeView.GetTargetSize()), Vector2(newSize.x*2.f, newSize.y), TEST_LOCATION);
 

-  landscapeView.SetProperty( PageTurnView::Property::PAGE_SIZE,newSize*1.5f);
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::PAGE_SIZE).Get<Vector2>(), newSize*1.5f, TEST_LOCATION );
+  landscapeView.SetProperty( PageTurnView::Property::VIEW_PAGE_SIZE,newSize*1.5f);
+  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), newSize*1.5f, TEST_LOCATION );

   Wait( application);
   DALI_TEST_EQUALS( Vector2(landscapeView.GetTargetSize()), Vector2(newSize.x*3.f, newSize.y*1.5f), TEST_LOCATION);
 
   Wait( application);
   DALI_TEST_EQUALS( Vector2(landscapeView.GetTargetSize()), Vector2(newSize.x*3.f, newSize.y*1.5f), TEST_LOCATION);
 

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp
index 3e66bf1..7b6a1f0 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp
@@ -588,9 +588,9 @@ int UtcDaliToolkitScrollModeP1(void)
   ScrollView scrollView = ScrollView::New();
 
   // Do not rely on stage size for UTC tests.
   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.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );

-  scrollView.SetSize( pageSize );
+  scrollView.SetSize( viewPageSize );

   scrollView.SetParentOrigin( ParentOrigin::CENTER );
   scrollView.SetAnchorPoint( AnchorPoint::CENTER );
   scrollView.SetPosition( 0.0f, 0.0f, 0.0f );
   scrollView.SetParentOrigin( ParentOrigin::CENTER );
   scrollView.SetAnchorPoint( AnchorPoint::CENTER );
   scrollView.SetPosition( 0.0f, 0.0f, 0.0f );


@@ -598,8 +598,8 @@ int UtcDaliToolkitScrollModeP1(void)
   // Position rulers.
   Property::Map rulerMap;
   rulerMap.Add( ScrollMode::X_AXIS_SCROLL_ENABLED, true );
   // 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);
 
   rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_ENABLED, false );
   scrollView.SetProperty( ScrollView::Property::SCROLL_MODE, rulerMap);
 


@@ -622,7 +622,7 @@ int UtcDaliToolkitScrollModeP1(void)
   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.
   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;
 
   // Finish the gesture and wait for the snap.
   currentPos += direction;


@@ -631,7 +631,7 @@ int UtcDaliToolkitScrollModeP1(void)
   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.
   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;
 }
 
   END_TEST;
 }


@@ -645,9 +645,9 @@ int UtcDaliToolkitScrollModeP2(void)
   ScrollView scrollView = ScrollView::New();
 
   // Do not rely on stage size for UTC tests.
   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.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );

-  scrollView.SetSize( pageSize );
+  scrollView.SetSize( viewPageSize );

   scrollView.SetParentOrigin( ParentOrigin::CENTER );
   scrollView.SetAnchorPoint( AnchorPoint::CENTER );
   scrollView.SetPosition( 0.0f, 0.0f, 0.0f );
   scrollView.SetParentOrigin( ParentOrigin::CENTER );
   scrollView.SetAnchorPoint( AnchorPoint::CENTER );
   scrollView.SetPosition( 0.0f, 0.0f, 0.0f );


@@ -656,8 +656,8 @@ int UtcDaliToolkitScrollModeP2(void)
   Property::Map rulerMap;
   rulerMap.Add( ScrollMode::X_AXIS_SCROLL_ENABLED, false );
   rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_ENABLED, true );
   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 );
   scrollView.SetProperty( ScrollView::Property::SCROLL_MODE, rulerMap);
 
   scrollView.SetWrapMode( false );


@@ -679,7 +679,7 @@ int UtcDaliToolkitScrollModeP2(void)
   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.
   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;
 
   // Finish the gesture and wait for the snap.
   currentPos += direction;


@@ -689,7 +689,7 @@ int UtcDaliToolkitScrollModeP2(void)
   Wait( application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL );
 
   // Confirm the final Y coord has snapped to exactly one page ahead of the start page.
   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;
 }
 
   END_TEST;
 }


@@ -703,9 +703,9 @@ int UtcDaliToolkitScrollModeP3(void)
   ScrollView scrollView = ScrollView::New();
 
   // Do not rely on stage size for UTC tests.
   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.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );

-  scrollView.SetSize( pageSize );
+  scrollView.SetSize( viewPageSize );

   scrollView.SetParentOrigin( ParentOrigin::CENTER );
   scrollView.SetAnchorPoint( AnchorPoint::CENTER );
   scrollView.SetPosition( 0.0f, 0.0f, 0.0f );
   scrollView.SetParentOrigin( ParentOrigin::CENTER );
   scrollView.SetAnchorPoint( AnchorPoint::CENTER );
   scrollView.SetPosition( 0.0f, 0.0f, 0.0f );


@@ -714,8 +714,8 @@ int UtcDaliToolkitScrollModeP3(void)
   Property::Map rulerMap;
   rulerMap.Add( ScrollMode::X_AXIS_SCROLL_ENABLED, false );
   rulerMap.Add( ScrollMode::Y_AXIS_SCROLL_ENABLED, true );
   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 );
   scrollView.SetProperty( ScrollView::Property::SCROLL_MODE, rulerMap);
 
   scrollView.SetWrapMode( false );


@@ -737,7 +737,7 @@ int UtcDaliToolkitScrollModeP3(void)
   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.
   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;
 
   // Finish the gesture and wait for the snap.
   currentPos += direction;


@@ -746,7 +746,7 @@ int UtcDaliToolkitScrollModeP3(void)
   Wait( application, RENDER_DELAY_SCROLL + RENDER_FRAME_INTERVAL );
 
   // Confirm the final Y coord has snapped to exactly one page ahead of the start page.
   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;
 }
 
   END_TEST;
 }


@@ -760,9 +760,9 @@ int UtcDaliToolkitScrollModeP4(void)
   ScrollView scrollView = ScrollView::New();
 
   // Do not rely on stage size for UTC tests.
   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.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );

-  scrollView.SetSize( pageSize );
+  scrollView.SetSize( viewPageSize );

   scrollView.SetParentOrigin( ParentOrigin::TOP_LEFT );
   scrollView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
   scrollView.SetPosition( 0.0f, 0.0f, 0.0f );
   scrollView.SetParentOrigin( ParentOrigin::TOP_LEFT );
   scrollView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
   scrollView.SetPosition( 0.0f, 0.0f, 0.0f );


@@ -2742,19 +2742,19 @@ int UtcDaliToolkitScrollViewGesturePageLimit(void)
   ScrollView scrollView = ScrollView::New();
 
   // Do not rely on stage size for UTC tests.
   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.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );

-  scrollView.SetSize( pageSize );
+  scrollView.SetSize( viewPageSize );

   scrollView.SetParentOrigin( ParentOrigin::CENTER );
   scrollView.SetAnchorPoint( AnchorPoint::CENTER );
   scrollView.SetPosition( 0.0f, 0.0f, 0.0f );
 
   // Position rulers.
   // We set the X ruler to fixed to give us pages to snap to.
   scrollView.SetParentOrigin( ParentOrigin::CENTER );
   scrollView.SetAnchorPoint( AnchorPoint::CENTER );
   scrollView.SetPosition( 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.
   // 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 );
   Dali::Toolkit::RulerPtr rulerY = new Dali::Toolkit::DefaultRuler();
   rulerY->Disable();
   scrollView.SetRulerX( rulerX );


@@ -2779,7 +2779,7 @@ int UtcDaliToolkitScrollViewGesturePageLimit(void)
   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.
   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;
 
   // Finish the gesture and wait for the snap.
   currentPos += direction;


@@ -2788,7 +2788,7 @@ int UtcDaliToolkitScrollViewGesturePageLimit(void)
   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.
   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;
 }
 
   END_TEST;
 }

diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.cpp b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.cpp
index 60ffd31..50f5d82 100644 (file)
--- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.cpp
+++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.cpp
@@ -61,9 +61,9 @@ PageTurnLandscapeView::~PageTurnLandscapeView()
 {
 }
 
 {
 }
 

-PageTurnLandscapeView PageTurnLandscapeView::New( PageFactory& pageFactory, const Vector2& pageSize )
+PageTurnLandscapeView PageTurnLandscapeView::New( PageFactory& pageFactory, const Vector2& viewPageSize )

 {
 {

-  return Internal::PageTurnLandscapeView::New(pageFactory, pageSize);
+  return Internal::PageTurnLandscapeView::New(pageFactory, viewPageSize);

 }
 
 PageTurnLandscapeView PageTurnLandscapeView::DownCast( BaseHandle handle )
 }
 
 PageTurnLandscapeView PageTurnLandscapeView::DownCast( BaseHandle handle )

diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h
index d2397b6..8f586f8 100644 (file)
--- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h
+++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h
@@ -71,10 +71,10 @@ public:
    * @brief Create an initialized PageTurnLandscapeView control
    * @SINCE_1_0.0
    * @param[in] pageFactory The factory which provides PageTurnView with pages.
    * @brief Create an initialized PageTurnLandscapeView control
    * @SINCE_1_0.0
    * @param[in] pageFactory The factory which provides PageTurnView with pages.

-   * @param[in] pageSize The size of the page
+   * @param[in] viewPageSize The size of the page

    * @return A handle to the PageTurnLandscapeView control.
    */
    * @return A handle to the PageTurnLandscapeView control.
    */

-  static PageTurnLandscapeView New( PageFactory& pageFactory, const Vector2& pageSize );
+  static PageTurnLandscapeView New( PageFactory& pageFactory, const Vector2& viewPageSize );

 
   /**
    * @brief Downcast an Object handle to PageTurnPortraitView. If handle points to a PageTurnLandscapeView the
 
   /**
    * @brief Downcast an Object handle to PageTurnPortraitView. If handle points to a PageTurnLandscapeView the

diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.cpp b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.cpp
index 9b4825e..175316e 100644 (file)
--- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.cpp
+++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.cpp
@@ -61,9 +61,9 @@ PageTurnPortraitView::~PageTurnPortraitView()
 {
 }
 
 {
 }
 

-PageTurnPortraitView PageTurnPortraitView::New( PageFactory& pageFactory, const Vector2& pageSize)
+PageTurnPortraitView PageTurnPortraitView::New( PageFactory& pageFactory, const Vector2& viewPageSize)

 {
 {

-  return Internal::PageTurnPortraitView::New(pageFactory, pageSize);
+  return Internal::PageTurnPortraitView::New(pageFactory, viewPageSize);

 }
 
 PageTurnPortraitView PageTurnPortraitView::DownCast( BaseHandle handle )
 }
 
 PageTurnPortraitView PageTurnPortraitView::DownCast( BaseHandle handle )

diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h
index 15dc95f..9bf715c 100644 (file)
--- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h
+++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h
@@ -72,10 +72,10 @@ public:
    * @brief Create an initialized  PageTurnPortraitView control
    * @SINCE_1_1.4
    * @param[in] pageFactory The factory which provides PageTurnView with pages.
    * @brief Create an initialized  PageTurnPortraitView control
    * @SINCE_1_1.4
    * @param[in] pageFactory The factory which provides PageTurnView with pages.

-   * @param[in] pageSize The size of the page
+   * @param[in] viewPageSize The size of the page

    * @return A handle to the PageTurnPortraitView control.
    */
    * @return A handle to the PageTurnPortraitView control.
    */

-  static PageTurnPortraitView New( PageFactory& pageFactory, const Vector2& pageSize );
+  static PageTurnPortraitView New( PageFactory& pageFactory, const Vector2& viewPageSize );

 
   /**
    * @brief Downcast an Object handle to PageTurnPortraitView. If handle points to a PageTurnPortraitView the
 
   /**
    * @brief Downcast an Object handle to PageTurnPortraitView. If handle points to a PageTurnPortraitView the

diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h
index 63bc35c..3d5df87 100644 (file)
--- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h
+++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h
@@ -81,8 +81,8 @@ public:
   {
     enum
     {
   {
     enum
     {

-      PAGE_SIZE = PROPERTY_START_INDEX, ///< name "pageSize",        type Vector2 @SINCE_1_1.4
-      CURRENT_PAGE_ID,                  ///< name "currentPageId",   type Integer @SINCE_1_1.4
+      VIEW_PAGE_SIZE = PROPERTY_START_INDEX, ///< name "viewPageSize",        type Vector2 @SINCE_1_1.4
+      CURRENT_PAGE_ID,                       ///< name "currentPageId",       type Integer @SINCE_1_1.4

 
       /**
        * The two values are the major&minor radius (in pixels) to form an ellipse shape.
 
       /**
        * The two values are the major&minor radius (in pixels) to form an ellipse shape.

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp
index 290cdf2..5bc97dc 100644 (file)
--- a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp
+++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.cpp
@@ -39,18 +39,18 @@ DALI_TYPE_REGISTRATION_END()
 
 }
 
 
 }
 

-PageTurnLandscapeView::PageTurnLandscapeView( PageFactory& pageFactory, const Vector2& pageSize )
-: PageTurnView( pageFactory, pageSize )
+PageTurnLandscapeView::PageTurnLandscapeView( PageFactory& pageFactory, const Vector2& viewPageSize )
+: PageTurnView( pageFactory, viewPageSize )

 {
 }
 
 PageTurnLandscapeView::~PageTurnLandscapeView()
 {}
 
 {
 }
 
 PageTurnLandscapeView::~PageTurnLandscapeView()
 {}
 

-Toolkit::PageTurnLandscapeView PageTurnLandscapeView::New( PageFactory& pageFactory, const Vector2& pageSize )
+Toolkit::PageTurnLandscapeView PageTurnLandscapeView::New( PageFactory& pageFactory, const Vector2& viewPageSize )

 {
   // Create the implementation, temporarily owned on stack
 {
   // Create the implementation, temporarily owned on stack

-  IntrusivePtr< PageTurnLandscapeView > internalPageTurnView = new PageTurnLandscapeView( pageFactory, pageSize );
+  IntrusivePtr< PageTurnLandscapeView > internalPageTurnView = new PageTurnLandscapeView( pageFactory, viewPageSize );

 
   // Pass ownership to CustomActor
   Dali::Toolkit::PageTurnLandscapeView pageTurnView( *internalPageTurnView );
 
   // Pass ownership to CustomActor
   Dali::Toolkit::PageTurnLandscapeView pageTurnView( *internalPageTurnView );

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h
index 4137796..aee1d5e 100644 (file)
--- a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h
+++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h
@@ -38,16 +38,16 @@ public:
   /**
    * @copydoc Toolkit::PageTurnLandscapeView::New( PageFactory&, const Vector2& )
    */
   /**
    * @copydoc Toolkit::PageTurnLandscapeView::New( PageFactory&, const Vector2& )
    */

-  static Toolkit::PageTurnLandscapeView New( PageFactory& pageFactory, const Vector2& pageSize );
+  static Toolkit::PageTurnLandscapeView New( PageFactory& pageFactory, const Vector2& viewPageSize );

 
 protected:
   /**
    * Constructor.
    * It initializes the PageTurnPortraitView members
    * @param[in] pageFactory The factory which provides image to PageTurnView as the page content.
 
 protected:
   /**
    * Constructor.
    * It initializes the PageTurnPortraitView members
    * @param[in] pageFactory The factory which provides image to PageTurnView as the page content.

-   * @param[in] pageSize The size of the page
+   * @param[in] viewPageSize The size of the page

    */
    */

-  PageTurnLandscapeView( PageFactory& pageFactory, const Vector2& pageSize );
+  PageTurnLandscapeView( PageFactory& pageFactory, const Vector2& viewPageSize );

 
   /**
    * A reference counted object may only be deleted by calling Unreference()
 
   /**
    * A reference counted object may only be deleted by calling Unreference()

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp
index 25393e9..4bde36a 100644 (file)
--- a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp
+++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.cpp
@@ -48,8 +48,8 @@ const float PAGE_TURN_OVER_ANIMATION_DURATION(0.5f);
 
 }
 
 
 }
 

-PageTurnPortraitView::PageTurnPortraitView( PageFactory& pageFactory, const Vector2& pageSize )
-: PageTurnView( pageFactory, pageSize )
+PageTurnPortraitView::PageTurnPortraitView( PageFactory& pageFactory, const Vector2& viewPageSize )
+: PageTurnView( pageFactory, viewPageSize )

 {
 }
 
 {
 }
 


@@ -57,10 +57,10 @@ PageTurnPortraitView::~PageTurnPortraitView()
 {
 }
 
 {
 }
 

-Toolkit::PageTurnPortraitView PageTurnPortraitView::New( PageFactory& pageFactory, const Vector2& pageSize )
+Toolkit::PageTurnPortraitView PageTurnPortraitView::New( PageFactory& pageFactory, const Vector2& viewPageSize )

 {
   // Create the implementation, temporarily owned on stack
 {
   // Create the implementation, temporarily owned on stack

-  IntrusivePtr< PageTurnPortraitView > internalPageTurnView = new PageTurnPortraitView( pageFactory, pageSize );
+  IntrusivePtr< PageTurnPortraitView > internalPageTurnView = new PageTurnPortraitView( pageFactory, viewPageSize );

 
   // Pass ownership to CustomActor
   Dali::Toolkit::PageTurnPortraitView pageTurnView( *internalPageTurnView );
 
   // Pass ownership to CustomActor
   Dali::Toolkit::PageTurnPortraitView pageTurnView( *internalPageTurnView );

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h
index 5e950f8..3cf9ef4 100644 (file)
--- a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h
+++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h
@@ -41,7 +41,7 @@ public:
   /**
    * @copydoc Toolkit::PageTurnPortraitView::New( PageFactory&, const Vector2& )
    */
   /**
    * @copydoc Toolkit::PageTurnPortraitView::New( PageFactory&, const Vector2& )
    */

-  static Toolkit::PageTurnPortraitView New( PageFactory& pageFactory, const Vector2& pageSize );
+  static Toolkit::PageTurnPortraitView New( PageFactory& pageFactory, const Vector2& viewPageSize );

 
 protected:
 
 
 protected:
 


@@ -49,9 +49,9 @@ protected:
    * Constructor.
    * It initializes the PageTurnPortraitView members
    * @param[in] pageFactory The factory which provides image to PageTurnView as the page content.
    * Constructor.
    * It initializes the PageTurnPortraitView members
    * @param[in] pageFactory The factory which provides image to PageTurnView as the page content.

-   * @param[in] pageSize The size of the page
+   * @param[in] viewPageSize The size of the page

    */
    */

-  PageTurnPortraitView( PageFactory& pageFactory, const Vector2& pageSize );
+  PageTurnPortraitView( PageFactory& pageFactory, const Vector2& viewPageSize );

 
   /**
    * A reference counted object may only be deleted by calling Unreference()
 
   /**
    * A reference counted object may only be deleted by calling Unreference()

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
index 0ee82e9..7a00f87 100644 (file)
--- a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
+++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
@@ -51,13 +51,13 @@ const char * const PROPERTY_PAN_CENTER( "panCenter" );// property used to constr
 // default grid density for page turn effect, 20 pixels by 20 pixels
 const float DEFAULT_GRID_DENSITY(20.0f);
 
 // default grid density for page turn effect, 20 pixels by 20 pixels
 const float DEFAULT_GRID_DENSITY(20.0f);
 

-// to bent the page, the minimal horizontal pan start position is pageSize.x * MINIMUM_START_POSITION_RATIO
+// to bent the page, the minimal horizontal pan start position is viewPageSize.x * MINIMUM_START_POSITION_RATIO

 const float MINIMUM_START_POSITION_RATIO(0.6f);
 
 const float MINIMUM_START_POSITION_RATIO(0.6f);
 

-// the maximum vertical displacement of pan gesture, if exceed, will reduce it: pageSize.y * MAXIMUM_VERTICAL_MOVEMENT_RATIO
+// the maximum vertical displacement of pan gesture, if exceed, will reduce it: viewPageSize.y * MAXIMUM_VERTICAL_MOVEMENT_RATIO

 const float MAXIMUM_VERTICAL_MOVEMENT_RATIO(0.15f);
 
 const float MAXIMUM_VERTICAL_MOVEMENT_RATIO(0.15f);
 

-// when the x component of pan position reaches pageSize.x * PAGE_TURN_OVER_THRESHOLD_RATIO, page starts to turn over
+// when the x component of pan position reaches viewPageSize.x * PAGE_TURN_OVER_THRESHOLD_RATIO, page starts to turn over

 const float PAGE_TURN_OVER_THRESHOLD_RATIO(0.5f);
 
 // duration of animation, shorter for faster speed
 const float PAGE_TURN_OVER_THRESHOLD_RATIO(0.5f);
 
 // duration of animation, shorter for faster speed


@@ -237,7 +237,7 @@ BaseHandle Create()
 // Setup properties, signals and actions using the type-registry.
 DALI_TYPE_REGISTRATION_BEGIN( Toolkit::PageTurnView, Toolkit::Control, Create );
 
 // Setup properties, signals and actions using the type-registry.
 DALI_TYPE_REGISTRATION_BEGIN( Toolkit::PageTurnView, Toolkit::Control, Create );
 

-DALI_PROPERTY_REGISTRATION( Toolkit, PageTurnView, "pageSize",        VECTOR2, PAGE_SIZE )
+DALI_PROPERTY_REGISTRATION( Toolkit, PageTurnView, "viewPageSize",        VECTOR2, VIEW_PAGE_SIZE )

 DALI_PROPERTY_REGISTRATION( Toolkit, PageTurnView, "currentPageId",   INTEGER, CURRENT_PAGE_ID )
 DALI_PROPERTY_REGISTRATION( Toolkit, PageTurnView, "spineShadow",     VECTOR2, SPINE_SHADOW )
 
 DALI_PROPERTY_REGISTRATION( Toolkit, PageTurnView, "currentPageId",   INTEGER, CURRENT_PAGE_ID )
 DALI_PROPERTY_REGISTRATION( Toolkit, PageTurnView, "spineShadow",     VECTOR2, SPINE_SHADOW )
 


@@ -340,10 +340,10 @@ void PageTurnView::Page::SetCurrentCenter( const Vector2& value )
   actor.SetProperty( propertyCurrentCenter, value );
 }
 
   actor.SetProperty( propertyCurrentCenter, value );
 }
 

-PageTurnView::PageTurnView( PageFactory& pageFactory, const Vector2& pageSize )
+PageTurnView::PageTurnView( PageFactory& pageFactory, const Vector2& viewPageSize )

 : Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ),
   mPageFactory( &pageFactory ),
 : Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ),
   mPageFactory( &pageFactory ),

-  mPageSize( pageSize ),
+  mPageSize( viewPageSize ),

   mSpineShadowParameter( DEFAULT_SPINE_SHADOW_PARAMETER ),
   mDistanceUpCorner( 0.f ),
   mDistanceBottomCorner( 0.f ),
   mSpineShadowParameter( DEFAULT_SPINE_SHADOW_PARAMETER ),
   mDistanceUpCorner( 0.f ),
   mDistanceBottomCorner( 0.f ),


@@ -494,9 +494,9 @@ void PageTurnView::OnStageDisconnection()
   Control::OnStageDisconnection();
 }
 
   Control::OnStageDisconnection();
 }
 

-void PageTurnView::SetPageSize( const Vector2& pageSize )
+void PageTurnView::SetPageSize( const Vector2& viewPageSize )

 {
 {

-  mPageSize = pageSize;
+  mPageSize = viewPageSize;

 
   if( mPointLight )
   {
 
   if( mPointLight )
   {


@@ -1044,7 +1044,7 @@ void PageTurnView::SetProperty( BaseObject* object, Property::Index index, const
 
     switch( index )
     {
 
     switch( index )
     {

-      case Toolkit::PageTurnView::Property::PAGE_SIZE:
+      case Toolkit::PageTurnView::Property::VIEW_PAGE_SIZE:

       {
         pageTurnViewImpl.SetPageSize( value.Get<Vector2>() );
         break;
       {
         pageTurnViewImpl.SetPageSize( value.Get<Vector2>() );
         break;


@@ -1075,7 +1075,7 @@ Property::Value PageTurnView::GetProperty( BaseObject* object, Property::Index i
 
     switch( index )
     {
 
     switch( index )
     {

-      case Toolkit::PageTurnView::Property::PAGE_SIZE:
+      case Toolkit::PageTurnView::Property::VIEW_PAGE_SIZE:

       {
         value = pageTurnViewImpl.GetPageSize();
         break;
       {
         value = pageTurnViewImpl.GetPageSize();
         break;

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
index 73aff02..b553dca 100644 (file)
--- a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
+++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
@@ -123,7 +123,7 @@ protected:
    * Constructor.
    * It initializes the PageTurnView members
    */
    * Constructor.
    * It initializes the PageTurnView members
    */

-  PageTurnView( PageFactory& pageFactory, const Vector2& pageSize );
+  PageTurnView( PageFactory& pageFactory, const Vector2& viewPageSize );

 
   /**
    * A reference counted object may only be deleted by calling Unreference()
 
   /**
    * A reference counted object may only be deleted by calling Unreference()


@@ -134,9 +134,9 @@ public:
 
   /**
    * Set the page size
 
   /**
    * Set the page size

-   * @param[in] pageSize The size of pages
+   * @param[in] viewPageSize The size of pages

    */
    */

-  void SetPageSize( const Vector2& pageSize );
+  void SetPageSize( const Vector2& viewPageSize );

 
   /**
    * Retrieve the page size.
 
   /**
    * Retrieve the page size.

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
index bb83e7d..e395194 100755 (executable)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
@@ -428,9 +428,9 @@ struct InternalPrePositionConstraint
         // Note: A further 1.0f is subtracted to handle a compensation that happens later within the flick handling code in SnapWithVelocity().
         //       When a flick is completed, an adjustment of 1.0f is sometimes made to allow for the scenario where:
         //       A flick finishes before the update thread has advanced the scroll position past the previous snap point.
         // Note: A further 1.0f is subtracted to handle a compensation that happens later within the flick handling code in SnapWithVelocity().
         //       When a flick is completed, an adjustment of 1.0f is sometimes made to allow for the scenario where:
         //       A flick finishes before the update thread has advanced the scroll position past the previous snap point.

-        Vector2 pageSizeLimit( size.x - ( 1.0f + 1.0f ), size.y - ( 1.0f - 1.0f ) );
-        Vector2 minPosition( mStartPosition.x - pageSizeLimit.x, mStartPosition.y - pageSizeLimit.y );
-        Vector2 maxPosition( mStartPosition.x + pageSizeLimit.x, mStartPosition.y + pageSizeLimit.y );
+        Vector2 viewPageSizeLimit( size.x - ( 1.0f + 1.0f ), size.y - ( 1.0f - 1.0f ) );
+        Vector2 minPosition( mStartPosition.x - viewPageSizeLimit.x, mStartPosition.y - viewPageSizeLimit.y );
+        Vector2 maxPosition( mStartPosition.x + viewPageSizeLimit.x, mStartPosition.y + viewPageSizeLimit.y );

 
         if( mFixedRulerX )
         {
 
         if( mFixedRulerX )
         {

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-path-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-path-effect-impl.cpp
index 89268b3..5d2c91b 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-path-effect-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-path-effect-impl.cpp
@@ -33,8 +33,8 @@ namespace Toolkit
 namespace Internal
 {
 
 namespace Internal
 {
 

-ScrollViewPagePathEffect::ScrollViewPagePathEffect(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& pageSize, unsigned int pageCount)
-:mPageSize(pageSize),
+ScrollViewPagePathEffect::ScrollViewPagePathEffect(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& viewPageSize, unsigned int pageCount)
+:mPageSize(viewPageSize),

  mInputPropertyIndex(inputPropertyIndex),
  mPageCount(pageCount)
 {
  mInputPropertyIndex(inputPropertyIndex),
  mPageCount(pageCount)
 {

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-path-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-path-effect-impl.h
index 033ddb5..d6fcccd 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-path-effect-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-path-effect-impl.h
@@ -48,10 +48,10 @@ public:
    * @param[in] path Pages will follow this path
    * @param[in] forward Vector in page local space which will be aligned with tangent of the path
    * @param[in] inputPropertyIndex index of the property in the scrollview used to drivce the path
    * @param[in] path Pages will follow this path
    * @param[in] forward Vector in page local space which will be aligned with tangent of the path
    * @param[in] inputPropertyIndex index of the property in the scrollview used to drivce the path

-   * @param[in] pageSize size of a page in the scrollview
+   * @param[in] viewPageSize size of a page in the scrollview

    * @param[in] pageCount total number of pages in the scrollview
    */
    * @param[in] pageCount total number of pages in the scrollview
    */

-  ScrollViewPagePathEffect(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& pageSize, unsigned int pageCount );
+  ScrollViewPagePathEffect(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& viewPageSize, unsigned int pageCount );

 
 public:
 
 
 public:
 

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.cpp
index a38f551..d8bdc75 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.cpp
+++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.cpp
@@ -29,9 +29,9 @@ namespace Dali
 namespace Toolkit
 {
 
 namespace Toolkit
 {
 

-ScrollViewPagePathEffect ScrollViewPagePathEffect::New(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& pageSize, unsigned int pageCount)
+ScrollViewPagePathEffect ScrollViewPagePathEffect::New(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& viewPageSize, unsigned int pageCount)

 {
 {

-  return ScrollViewPagePathEffect(new Internal::ScrollViewPagePathEffect(path, forward, inputPropertyIndex, pageSize,pageCount));
+  return ScrollViewPagePathEffect(new Internal::ScrollViewPagePathEffect(path, forward, inputPropertyIndex, viewPageSize,pageCount));

 }
 
 ScrollViewPagePathEffect::ScrollViewPagePathEffect()
 }
 
 ScrollViewPagePathEffect::ScrollViewPagePathEffect()

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h
index 4207633..6847d43 100755 (executable)
--- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h
+++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h
@@ -76,11 +76,11 @@ public:
    * @param[in] path The path that will be used by the scroll effect
    * @param[in] forward Vector in page object space which will be aligned with the tangent of the path
    * @param[in] inputPropertyIndex Index of a property of the scroll-view which will be used as the input for the path
    * @param[in] path The path that will be used by the scroll effect
    * @param[in] forward Vector in page object space which will be aligned with the tangent of the path
    * @param[in] inputPropertyIndex Index of a property of the scroll-view which will be used as the input for the path

-   * @param[in] pageSize Size of a page in the scrollview
+   * @param[in] viewPageSize Size of a page in the scrollview

    * @param[in] pageCount Total number of pages in the scrollview
    * @return A handle to a newly allocated Dali resource
    */
    * @param[in] pageCount Total number of pages in the scrollview
    * @return A handle to a newly allocated Dali resource
    */

-  static ScrollViewPagePathEffect New(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& pageSize, unsigned int pageCount);
+  static ScrollViewPagePathEffect New(Path path, const Vector3& forward, Dali::Property::Index inputPropertyIndex, const Vector3& viewPageSize, unsigned int pageCount);

 
   /**
    * @brief Creates an uninitialized ScrollViewPagePathEffect; this can be initialized with ScrollViewPagePathEffect::New().
 
   /**
    * @brief Creates an uninitialized ScrollViewPagePathEffect; this can be initialized with ScrollViewPagePathEffect::New().