X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-page-path-effect-impl.cpp;h=5d2c91b5baa0afbc6bbe2344f58cba52a8b5373c;hp=439dd8f33494ca773400bf5d99c77d5b915af023;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=820c66e71516e7a25600b8b5de2e84b5d44d8ff3 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 439dd8f..5d2c91b 100644 --- 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 @@ -18,7 +18,10 @@ // CLASS HEADER #include -//INTERNAL INCLUDES +// EXTERNAL INCLUDES +#include + +// INTERNAL INCLUDES #include namespace Dali @@ -30,8 +33,8 @@ namespace Toolkit 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) { @@ -47,9 +50,14 @@ ScrollViewPagePathEffect::ScrollViewPagePathEffect(Path path, const Vector3& for //Create linear constrainer pointsProperty = Property::Value(Property::ARRAY); - pointsProperty.AppendItem(0.0f); - pointsProperty.AppendItem(1.0f); - pointsProperty.AppendItem(0.0f); + Property::Array* array = pointsProperty.GetArray(); + + if( array ) + { + array->PushBack(0.0f); + array->PushBack(1.0f); + array->PushBack(0.0f); + } mLinearConstrainer = Dali::LinearConstrainer::New(); mLinearConstrainer.SetProperty( LinearConstrainer::Property::VALUE, pointsProperty ); }