X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-constraints.cpp;h=ac3b3ed16b4b001f4cb98717ee92939a6bf5252a;hb=13f73abbc38eb319e54c0c1310bb4aa43d86ce6d;hp=995bfc2481962a4e9b9afe7bd800b6370987f50c;hpb=cd7d41bc8e0a0816da28401207091344fbbe0b2c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp index 995bfc2..ac3b3ed 100644 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ namespace Toolkit void MoveActorConstraint( Vector3& current, const PropertyInputContainer& inputs ) { - current += inputs[0]->GetVector3(); + current += Vector3(inputs[0]->GetVector2()); } void WrapActorConstraint( Vector3& position, const PropertyInputContainer& inputs ) @@ -41,8 +41,8 @@ void WrapActorConstraint( Vector3& position, const PropertyInputContainer& input if(wrap) { - const Vector3& min = inputs[3]->GetVector3(); - const Vector3& max = inputs[4]->GetVector3(); + const Vector2& min = inputs[3]->GetVector2(); + const Vector2& max = inputs[4]->GetVector2(); const Vector3& anchor = inputs[1]->GetVector3(); const Vector3 scale = inputs[0]->GetVector3();