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
Changes after touch consumed behaviour change
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
item-view
/
item-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
old mode 100755
(executable)
new mode 100644
(file)
index
8492234
..
0d40921
--- a/
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
@@
-1142,7
+1142,7
@@
bool ItemView::OnTouch( Actor actor, const TouchData& touch )
RemoveAnimation(mScrollAnimation);
}
- return
true; // consume since we're potentially scrolling
+ return
false; // Do not consume as we're potentially scrolling (detecting pan gestures)
}
void ItemView::OnPan( const PanGesture& gesture )