X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-constraints.cpp;h=ac3b3ed16b4b001f4cb98717ee92939a6bf5252a;hp=48b21f156955f7bcef99ef1ffccc1f39ef9c250a;hb=refs%2Fchanges%2F34%2F39034%2F20;hpb=2ddfbb9e23a7c3fc30e604236c41e0ef6d2ed6a2

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 48b21f1..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.
@@ -30,31 +30,23 @@ namespace Dali
 namespace Toolkit
 {
 
-Vector3 MoveActorConstraint(const Vector3&    current,
-                            const PropertyInput& scrollPositionProperty)
+void MoveActorConstraint( Vector3& current, const PropertyInputContainer& inputs )
 {
-  return current + scrollPositionProperty.GetVector3();
+  current += Vector3(inputs[0]->GetVector2());
 }
 
-Vector3 WrapActorConstraint(const Vector3&    current,
-                            const PropertyInput& actorScaleProperty,
-                            const PropertyInput& actorAnchorPointProperty,
-                            const PropertyInput& actorSizeProperty,
-                            const PropertyInput& scrollPositionMin,
-                            const PropertyInput& scrollPositionMax,
-                            const PropertyInput& scrollWrap)
+void WrapActorConstraint( Vector3& position, const PropertyInputContainer& inputs )
 {
-  Vector3 position = current;
-  bool wrap = scrollWrap.GetBoolean();
+  bool wrap = inputs[5]->GetBoolean();
 
   if(wrap)
   {
-    const Vector3& min = scrollPositionMin.GetVector3();
-    const Vector3& max = scrollPositionMax.GetVector3();
+    const Vector2& min = inputs[3]->GetVector2();
+    const Vector2& max = inputs[4]->GetVector2();
 
-    const Vector3& anchor = actorAnchorPointProperty.GetVector3();
-    const Vector3 scale = actorScaleProperty.GetVector3();
-    const Vector3 size = actorSizeProperty.GetVector3();
+    const Vector3& anchor = inputs[1]->GetVector3();
+    const Vector3 scale = inputs[0]->GetVector3();
+    const Vector3 size = inputs[2]->GetVector3();
 
     if(fabsf(min.x - max.x) > Math::MACHINE_EPSILON_1)
     {
@@ -70,8 +62,6 @@ Vector3 WrapActorConstraint(const Vector3&    current,
       position.y = WrapInDomain(position.y + offsetY, min.y, max.y) - offsetY;
     }
   }
-
-  return position;
 }
 
 } // namespace Toolkit