X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-carousel-effect-impl.cpp;h=f17eb78141432ef38d86787439403c2d89b14fe3;hb=fa83ec19c60479f5fb95fee1302881ec51dfe23a;hp=4f467f2a265d7e6713b0238ea926ad448c7e78e8;hpb=402784aceba9171e57ffca8769ca46ef8aebcd2f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp
index 4f467f2..f17eb78 100644
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp
@@ -89,7 +89,7 @@ public:
   void VisibilityConstraint( bool& current, const PropertyInputContainer& inputs )
   {
     const Vector2& anchor(AnchorPoint::CENTER.GetVectorXY());
-    Vector2 position( inputs[0]->GetVector3() + inputs[3]->GetVector3());
+    Vector2 position( inputs[0]->GetVector3().GetVectorXY() + inputs[3]->GetVector2());
     Vector2 scaledSize( inputs[2]->GetVector3() * inputs[1]->GetVector3());
 
     Vector2 domain( inputs[4]->GetVector3() );
@@ -124,7 +124,7 @@ public:
     }
 
     const Vector2& anchor(AnchorPoint::CENTER.GetVectorXY());
-    Vector2 position(inputs[0]->GetVector3() + inputs[3]->GetVector3());
+    Vector2 position( inputs[0]->GetVector3().GetVectorXY() + inputs[3]->GetVector2());
     Vector2 scaledSize(inputs[2]->GetVector3() * inputs[1]->GetVector3());
     Vector2 domain(inputs[4]->GetVector3());
 
@@ -144,8 +144,8 @@ public:
 
     angle *= activate;
 
-    current = Quaternion(-angle.x, Vector3::YAXIS) *
-              Quaternion(angle.y, Vector3::XAXIS) *
+    current = Quaternion( Radian( -angle.x ), Vector3::YAXIS ) *
+              Quaternion( Radian( angle.y ), Vector3::XAXIS ) *
               current;
   }
 
@@ -168,7 +168,7 @@ public:
       return;
     }
 
-    position += inputs[2]->GetVector3();
+    position.GetVectorXY() += inputs[2]->GetVector2();
 
     const Vector2& anchor(AnchorPoint::CENTER.GetVectorXY());
     Vector2 scaledSize(inputs[1]->GetVector3() * inputs[0]->GetVector3());