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:
2c67a98
)
elementary: Fixed the problem of scroller (photocam, gengrid, ... maybe other). When...
author
yoz
<yoz@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Mon, 19 Dec 2011 18:17:45 +0000
(18:17 +0000)
committer
yoz
<yoz@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Mon, 19 Dec 2011 18:17:45 +0000
(18:17 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@66339
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
0f9da3b
..
bf0301a
100644
(file)
--- a/
src/lib/els_scroller.c
+++ b/
src/lib/els_scroller.c
@@
-2534,6
+2534,10
@@
_smart_scrollbar_read(Smart_Data *sd)
Evas_Coord x, y, mx = 0, my = 0, px, py, minx = 0, miny = 0;
double vx, vy;
+ if ((sd->down.dragged) || (sd->down.bounce_x_animator)
+ || (sd->down.bounce_y_animator) || (sd->down.momentum_animator)
+ || (sd->scrollto.x.animator) || (sd->scrollto.y.animator))
+ return;
edje_object_part_drag_value_get(sd->edje_obj, "elm.dragable.vbar", NULL, &vy);
edje_object_part_drag_value_get(sd->edje_obj, "elm.dragable.hbar", &vx, NULL);
sd->pan_func.max_get(sd->pan_obj, &mx, &my);