projects
/
framework
/
uifw
/
elementary.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
15ccbb5
)
The animation have to be stopped just if the scroller is not holded or freezed.
author
jaehwan
<jaehwan@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Wed, 4 Apr 2012 08:13:39 +0000
(08:13 +0000)
committer
Jaehwan Kim
<jae.hwan.kim@samsung.com>
Wed, 4 Apr 2012 08:25:02 +0000
(17:25 +0900)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@69916
7cbeb6ba
-43b4-40fd-8cce-
4c39aea84d33
src/lib/els_scroller.c
patch
|
blob
|
history
diff --git
a/src/lib/els_scroller.c
b/src/lib/els_scroller.c
index
2637db2
..
923f453
100644
(file)
--- a/
src/lib/els_scroller.c
+++ b/
src/lib/els_scroller.c
@@
-2300,7
+2300,7
@@
_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *
{
int dodir = 0;
- if (
sd->scrollto.x.animator
)
+ if (
(sd->scrollto.x.animator) && (!sd->hold) && (!sd->freeze)
)
{
Evas_Coord px;
ecore_animator_del(sd->scrollto.x.animator);
@@
-2310,7
+2310,7
@@
_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *
sd->down.x = sd->down.history[0].x;
}
- if (
sd->scrollto.y.animator
)
+ if (
(sd->scrollto.y.animator) && (!sd->hold) && (!sd->freeze)
)
{
Evas_Coord py;
ecore_animator_del(sd->scrollto.y.animator);