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

re-enable building against latest efl git 

In EFL git head, this function has changed to be just
evas_object_coords_inside_get. This patch wraps the two different
function names around an #ifdef so we can check EFL version that we
are building against and call the correct function accordingly.

Fixes T6500

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2017-12-12 10:19:37 -05:00
parent fbc72ceaee
commit a782beba82
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/e_comp_object.c
View File

@ -3365,7 +3365,17 @@ e_comp_object_coords_inside_input_area(Evas_Object *obj, int x, int y)
Eina_Array_Iterator it;
EINA_ARRAY_ITER_NEXT(cw->input_objs, i, rect, it)
if (evas_object_pointer_coords_inside_get(rect, x, y)) return EINA_TRUE;
{
#ifndef EFL_VERSION_1_21
if (evas_object_pointer_coords_inside_get(rect, x, y))
return EINA_TRUE;
#else
Eina_Position2D pos = {x, y};
if (evas_object_coords_inside_get(rect, pos))
return EINA_TRUE;
#endif
}
return EINA_FALSE;
}