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_2.0.30] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
scroll-view
/
scroll-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
index
ac062ff
..
8ca6855
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
@@
-1823,10
+1823,17
@@
Toolkit::ScrollView::SnapStartedSignalType& ScrollView::SnapStartedSignal()
return mSnapStartedSignal;
}
return mSnapStartedSignal;
}
-
void ScrollView::AccessibleImpl::EnsureChildVisible
(Actor child)
+
bool ScrollView::AccessibleImpl::ScrollToChild
(Actor child)
{
auto scrollView = Dali::Toolkit::ScrollView::DownCast(Self());
{
auto scrollView = Dali::Toolkit::ScrollView::DownCast(Self());
- scrollView.ScrollTo(child);
+ if (Toolkit::GetImpl(scrollView).FindClosestActor() == child)
+ {
+ return false;
+ }
+
+ // FIXME: ScrollTo does not work (snaps back to original position)
+ scrollView.ScrollTo(child, scrollView.GetScrollFlickDuration());
+ return true;
}
void ScrollView::FindAndUnbindActor(Actor child)
}
void ScrollView::FindAndUnbindActor(Actor child)