X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view.cpp;h=08bd1ff0ff11c70301450575377ad250b0747e92;hb=820c66e71516e7a25600b8b5de2e84b5d44d8ff3;hp=158acfaa626b3145bba5f8980984883c020ccb15;hpb=df89f9f230cadaac7be4007d1b1a7cf7dc893011;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp index 158acfa..08bd1ff 100644 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp @@ -248,7 +248,7 @@ unsigned int FixedRuler::GetPageFromPosition(float position, bool wrap) const { position = WrapInDomain(position, mDomain.min, mDomain.max); } - page = floor((position - mDomain.min) / mSpacing + 0.5f); + page = std::max(static_cast(0.0f), floor((position - mDomain.min) / mSpacing + 0.5f)); if(wrap) { @@ -501,11 +501,6 @@ Vector2 ScrollView::GetCurrentScrollPosition() const return GetImpl(*this).GetCurrentScrollPosition(); } -void ScrollView::SetScrollPosition(const Vector2& position) -{ - GetImpl(*this).SetScrollPosition(position); -} - unsigned int ScrollView::GetCurrentPage() const { return GetImpl(*this).GetCurrentPage();