projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_1.0.42] Merge branch 'tizen'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
scrollable
/
scroll-view
/
scroll-view.cpp
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
(file)
--- 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);
}
{
position = WrapInDomain(position, mDomain.min, mDomain.max);
}
- page =
floor((position - mDomain.min) / mSpacing + 0.5f
);
+ page =
std::max(static_cast<double>(0.0f), floor((position - mDomain.min) / mSpacing + 0.5f)
);
if(wrap)
{
if(wrap)
{
@@
-501,11
+501,6
@@
Vector2 ScrollView::GetCurrentScrollPosition() const
return GetImpl(*this).GetCurrentScrollPosition();
}
return GetImpl(*this).GetCurrentScrollPosition();
}
-void ScrollView::SetScrollPosition(const Vector2& position)
-{
- GetImpl(*this).SetScrollPosition(position);
-}
-
unsigned int ScrollView::GetCurrentPage() const
{
return GetImpl(*this).GetCurrentPage();
unsigned int ScrollView::GetCurrentPage() const
{
return GetImpl(*this).GetCurrentPage();