From 5ab310ef5d2beb5de361e6cd58f75d6369e1e68e Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Tue, 24 Jul 2012 02:35:25 +0000 Subject: [PATCH] elementary/scroller - Fixed scroller to not have the hold flag which causes the edje object up event block. Please review this patch I don't know the intention why did someone add this flags on mouse up in scroller. Anyhow I tested and works fine. SVN revision: 74334 --- legacy/elementary/ChangeLog | 4 ++++ legacy/elementary/src/lib/els_scroller.c | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index 2a6673a3e3..3ccbc7711a 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -336,3 +336,7 @@ 2012-07-23 Hermet (ChunEon Park) * fixed invalid sd memory access when delete window inlined image + +2012-07-24 Hermet (ChunEon Park) + + * fixed scroller to not have the hold flag when mouse up happened. diff --git a/legacy/elementary/src/lib/els_scroller.c b/legacy/elementary/src/lib/els_scroller.c index 1723dc1516..1a5f950c67 100644 --- a/legacy/elementary/src/lib/els_scroller.c +++ b/legacy/elementary/src/lib/els_scroller.c @@ -2162,7 +2162,6 @@ _smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *ev #else t = ecore_loop_time_get(); #endif - ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; ax = ev->canvas.x; ay = ev->canvas.y; at = 0.0; @@ -2315,10 +2314,7 @@ _smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *ev sd->down.scroll = EINA_FALSE; } if (sd->down.hold) - { - ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; - sd->down.hold = EINA_FALSE; - } + sd->down.hold = EINA_FALSE; sd->down.dragged_began = EINA_FALSE; sd->down.dir_x = EINA_FALSE; sd->down.dir_y = EINA_FALSE;