Fixes for latest merge and temporarily removed V8 support

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / scrollable / item-view / item-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
index a9f342c..d122e38 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
@@ -1506,6 +1506,7 @@ void ItemView::SetOvershootEffectColor( const Vector4& color )
 
 void ItemView::SetOvershootEnabled( bool enable )
 {
+/**
   Actor self = Self();
   if( enable )
   {
@@ -1516,7 +1517,6 @@ void ItemView::SetOvershootEnabled( bool enable )
     mOvershootOverlay.SetAnchorPoint(AnchorPoint::TOP_LEFT);
     mOvershootOverlay.SetDrawMode(DrawMode::OVERLAY);
     self.Add(mOvershootOverlay);
-
     Constraint constraint = Constraint::New<Vector3>( mOvershootOverlay, Actor::Property::SIZE, OvershootOverlaySizeConstraint );
     constraint.AddSource( ParentSource( Toolkit::Scrollable::Property::SCROLL_DIRECTION ) );
     constraint.AddSource( ParentSource( Actor::Property::SIZE ) );
@@ -1551,6 +1551,7 @@ void ItemView::SetOvershootEnabled( bool enable )
       mOvershootOverlay.Reset();
     }
   }
+*/
 }
 
 float ItemView::CalculateScrollOvershoot()
@@ -1588,13 +1589,15 @@ void ItemView::AnimateScrollOvershoot(float overshootAmount, bool animateBack)
 
   if(mOvershootAnimationSpeed > Math::MACHINE_EPSILON_0)
   {
-    float currentOvershoot = mScrollPositionObject.GetProperty<float>(ScrollConnector::OVERSHOOT);
+    //float currentOvershoot = mScrollPositionObject.GetProperty<float>(ScrollConnector::OVERSHOOT);
     float duration = 0.0f;
 
+    /**
     if (mOvershootOverlay)
     {
       duration = mOvershootOverlay.GetCurrentSize().height * (animatingOn ? (1.0f - fabsf(currentOvershoot)) : fabsf(currentOvershoot)) / mOvershootAnimationSpeed;
     }
+    */
 
     RemoveAnimation(mScrollOvershootAnimation);
     mScrollOvershootAnimation = Animation::New(duration);