X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view.cpp;h=aba105406f030f489f94121aec45adf06cbb70c8;hp=e3339024cf88e20174f45444b1054b39b92732b6;hb=a342499604e471b0e0d80eac30eb28e898b06c69;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836 diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp index e333902..aba1054 100644 --- a/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp +++ b/base/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp @@ -280,7 +280,7 @@ const std::string ScrollView::SCROLL_START_PAGE_POSITION_PROPERTY_NAME( "scroll- const float ScrollView::DEFAULT_SLOW_SNAP_ANIMATION_DURATION(0.5f); const float ScrollView::DEFAULT_FAST_SNAP_ANIMATION_DURATION(0.25f); -const float ScrollView::DEFAULT_SNAP_OVERSHOOT_DURATION(1.0f); +const float ScrollView::DEFAULT_SNAP_OVERSHOOT_DURATION(0.5f); const float ScrollView::DEFAULT_MAX_OVERSHOOT(100.0f); // 100 pixels const float ScrollView::DEFAULT_AXIS_AUTO_LOCK_GRADIENT(0.36f); @@ -438,6 +438,16 @@ void ScrollView::SetRefreshInterval(int milliseconds) GetImpl(*this).SetRefreshInterval(milliseconds); } +int ScrollView::GetScrollUpdateDistance() const +{ + return GetImpl(*this).GetScrollUpdateDistance(); +} + +void ScrollView::SetScrollUpdateDistance(int distance) +{ + GetImpl(*this).SetScrollUpdateDistance(distance); +} + bool ScrollView::GetAxisAutoLock() const { return GetImpl(*this).GetAxisAutoLock(); @@ -478,6 +488,26 @@ void ScrollView::SetFlickSpeedCoefficient(float speed) GetImpl(*this).SetFlickSpeedCoefficient(speed); } +Vector2 ScrollView::GetMinimumDistanceForFlick() const +{ + return GetImpl(*this).GetMinimumDistanceForFlick(); +} + +void ScrollView::SetMinimumDistanceForFlick( const Vector2& distance ) +{ + GetImpl(*this).SetMinimumDistanceForFlick(distance); +} + +float ScrollView::GetMinimumSpeedForFlick() const +{ + return GetImpl(*this).GetMinimumSpeedForFlick(); +} + +void ScrollView::SetMinimumSpeedForFlick( float speed ) +{ + GetImpl(*this).SetMinimumSpeedForFlick(speed); +} + float ScrollView::GetMaxFlickSpeed() const { return GetImpl(*this).GetMaxFlickSpeed(); @@ -503,6 +533,11 @@ Vector3 ScrollView::GetCurrentScrollPosition() const return GetImpl(*this).GetCurrentScrollPosition(); } +void ScrollView::SetScrollPosition(const Vector3& position) +{ + GetImpl(*this).SetScrollPosition(position); +} + Vector3 ScrollView::GetCurrentScrollScale() const { return GetImpl(*this).GetCurrentScrollScale();