From a331fe3bca4816e3a45662afd986e364b3586eed Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Thu, 20 Oct 2011 12:21:41 +0000 Subject: [PATCH] evas/evas_events.c - removed duplicated lines SVN revision: 64198 --- legacy/evas/src/lib/canvas/evas_events.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_events.c b/legacy/evas/src/lib/canvas/evas_events.c index 08cbabf07c..7087475b37 100644 --- a/legacy/evas/src/lib/canvas/evas_events.c +++ b/legacy/evas/src/lib/canvas/evas_events.c @@ -39,11 +39,10 @@ _evas_event_object_list_in_get(Evas *e, Eina_List *in, { if (obj->smart.smart) { - int norep; + int norep = 0; int inside; - norep = 0; - if (((obj->cur.map) && (obj->cur.map->count == 4) && (obj->cur.usemap))) + if (((obj->cur.usemap) && (obj->cur.map) && (obj->cur.map->count == 4))) { inside = evas_object_is_in_output_rect(obj, x, y, 1, 1); if (inside) @@ -79,11 +78,10 @@ _evas_event_object_list_in_get(Evas *e, Eina_List *in, } else { - int inside = 1; + int inside = evas_object_is_in_output_rect(obj, x, y, 1, 1); - if (((obj->cur.map) && (obj->cur.map->count == 4) && (obj->cur.usemap))) + if (((obj->cur.usemap) && (obj->cur.map) && (obj->cur.map->count == 4))) { - inside = evas_object_is_in_output_rect(obj, x, y, 1, 1); if ((inside) && (!evas_map_coords_get(obj->cur.map, x, y, &(obj->cur.map->mx), &(obj->cur.map->my), 0))) @@ -91,10 +89,6 @@ _evas_event_object_list_in_get(Evas *e, Eina_List *in, inside = 0; } } - else - { - inside = evas_object_is_in_output_rect(obj, x, y, 1, 1); - } if (inside && ((!obj->precise_is_inside) || (evas_object_is_inside(obj, x, y))))