orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas/evas_events.c - removed duplicated lines 

SVN revision: 64198
This commit is contained in:
ChunEon Park 2011-10-20 12:21:41 +00:00
parent 0d616af28e
commit a331fe3bca
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
legacy/evas/src/lib/canvas/evas_events.c
View File

@ -39,11 +39,10 @@ _evas_event_object_list_in_get(Evas *e, Eina_List *in,
{ {
if (obj->smart.smart) if (obj->smart.smart)
{ {
int norep; int norep = 0;
int inside; int inside;
norep = 0; if (((obj->cur.usemap) && (obj->cur.map) && (obj->cur.map->count == 4)))
if (((obj->cur.map) && (obj->cur.map->count == 4) && (obj->cur.usemap)))
{ {
inside = evas_object_is_in_output_rect(obj, x, y, 1, 1); inside = evas_object_is_in_output_rect(obj, x, y, 1, 1);
if (inside) if (inside)
@ -79,11 +78,10 @@ _evas_event_object_list_in_get(Evas *e, Eina_List *in,
} }
else 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, if ((inside) && (!evas_map_coords_get(obj->cur.map, x, y,
&(obj->cur.map->mx), &(obj->cur.map->mx),
&(obj->cur.map->my), 0))) &(obj->cur.map->my), 0)))
@ -91,10 +89,6 @@ _evas_event_object_list_in_get(Evas *e, Eina_List *in,
inside = 0; inside = 0;
} }
} }
else
{
inside = evas_object_is_in_output_rect(obj, x, y, 1, 1);
}
if (inside && ((!obj->precise_is_inside) || if (inside && ((!obj->precise_is_inside) ||
(evas_object_is_inside(obj, x, y)))) (evas_object_is_inside(obj, x, y))))