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
ScrollView - Store properties in local values for GetCurrentScrollPosition
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
public-api
/
controls
/
scrollable
/
scroll-view
/
scroll-view.cpp
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
ff8fd79
..
84a7df9
100644
(file)
--- 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
@@
-233,6
+233,10
@@
unsigned int FixedRuler::GetPageFromPosition(float position, bool wrap) const
// spacing must be present.
if(mEnabled && fabsf(mSpacing) > Math::MACHINE_EPSILON_1)
{
+ if( wrap )
+ {
+ position = WrapInDomain(position, mDomain.min, mDomain.max);
+ }
page = floor((position - mDomain.min) / mSpacing + 0.5f);
if(wrap)