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

evas: Remove duplicated code 

Reviewers: raster, cedric

Reviewed By: raster

Subscribers: jpeg

Differential Revision: https://phab.enlightenment.org/D5552
This commit is contained in:
Yeongjong Lee 2017-11-29 11:48:21 +09:00 committed by Carsten Haitzler (Rasterman)
parent 6946ff6318
commit c1e9d9f2f0
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/lib/evas/include/evas_inline.x
View File

@ -230,25 +230,14 @@ evas_object_is_active(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
int fx, fy;
fx = e->framespace.x;
fy = e->framespace.y;
if (obj->is_smart)
{
int mapsmt = 0;
if (obj->map->cur.map && obj->map->cur.usemap) mapsmt = 1;
if (!mapsmt) return 1;
if (evas_object_is_in_output_rect(eo_obj, obj, -fx, -fy,
e->output.w, e->output.h) ||
evas_object_was_in_output_rect(eo_obj, obj, -fx, -fy,
e->output.w, e->output.h))
return 1;
}
else
{
if (evas_object_is_in_output_rect(eo_obj, obj, -fx, -fy,
e->output.w, e->output.h) ||
evas_object_was_in_output_rect(eo_obj, obj, -fx, -fy,
e->output.w, e->output.h))
return 1;
}
if (obj->is_smart && !(obj->map->cur.map && obj->map->cur.usemap))
return 1;
if (evas_object_is_in_output_rect(eo_obj, obj, -fx, -fy,
e->output.w, e->output.h) ||
evas_object_was_in_output_rect(eo_obj, obj, -fx, -fy,
e->output.w, e->output.h))
return 1;
}
/* FIXME: forcing object with proxies to stay active,
need to be smarter and only do that when really needed. */