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
Reset mGestureStackDepth when panning is interrupted by ScrollTo
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
scroll-view
/
scroll-view-impl.cpp
diff --git
a/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
b/base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
index
0c761fb
..
0d37399
100644
(file)
--- a/
base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
+++ b/
base/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
@@
-1296,6
+1296,7
@@
void ScrollView::TransformTo(const Vector3& position, const Vector3& scale, floa
{
DALI_LOG_SCROLL_STATE("[0x%X] Interrupting Pan, set to false", this );
mPanning = false;
{
DALI_LOG_SCROLL_STATE("[0x%X] Interrupting Pan, set to false", this );
mPanning = false;
+ mGestureStackDepth = 0;
self.SetProperty( mPropertyPanning, false );
if( mScrollMainInternalPrePositionConstraint )
self.SetProperty( mPropertyPanning, false );
if( mScrollMainInternalPrePositionConstraint )
@@
-2646,6
+2647,10
@@
void ScrollView::OnGestureEx(Gesture::State state)
{
FinishTransform();
}
{
FinishTransform();
}
+ else
+ {
+ DALI_LOG_SCROLL_STATE("[0x%X] mGestureStackDepth[%d]", this, mGestureStackDepth);
+ }
}
}
}
}