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
(ItemView) Implemented SetOvershootEnabled which is used by Scrollable::Enable/Disabl...
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
scrollable-impl.cpp
diff --git
a/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
b/base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
index
d99e5e1
..
021b908
100644
(file)
--- a/
base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
+++ b/
base/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
@@
-99,7
+99,7
@@
bool Scrollable::IsScrollComponentEnabled(Toolkit::Scrollable::ScrollComponentTy
void Scrollable::EnableScrollComponent(Toolkit::Scrollable::ScrollComponentType type)
{
void Scrollable::EnableScrollComponent(Toolkit::Scrollable::ScrollComponentType type)
{
- if(type == Toolkit::Scrollable::OvershootIndicator)
+ if(type == Toolkit::Scrollable::OvershootIndicator
&& !mOvershootEnabled
)
{
SetOvershootEnabled(true);
mOvershootEnabled = true;
{
SetOvershootEnabled(true);
mOvershootEnabled = true;
@@
-119,7
+119,7
@@
void Scrollable::EnableScrollComponent(Toolkit::Scrollable::ScrollComponentType
void Scrollable::DisableScrollComponent(Toolkit::Scrollable::ScrollComponentType type)
{
void Scrollable::DisableScrollComponent(Toolkit::Scrollable::ScrollComponentType type)
{
- if(type == Toolkit::Scrollable::OvershootIndicator)
+ if(type == Toolkit::Scrollable::OvershootIndicator
&& mOvershootEnabled
)
{
SetOvershootEnabled(false);
mOvershootEnabled = false;
{
SetOvershootEnabled(false);
mOvershootEnabled = false;