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

Evas - Modified field names in Evas structure to be more clear. 

SVN revision: 64371
This commit is contained in:
ChunEon Park 2011-10-25 02:26:51 +00:00
parent 4aa5ab36f5
commit 8658d955ce
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/evas/src/lib/canvas/evas_object_smart.c
View File

@ -763,7 +763,7 @@ evas_object_smart_member_cache_invalidate(Evas_Object *obj)
return; return;
MAGIC_CHECK_END(); MAGIC_CHECK_END();
obj->parent_cache_valid = 0; obj->parent_cache.pass_events_valid = 0;
o = (Evas_Object_Smart *)(obj->object_data); o = (Evas_Object_Smart *)(obj->object_data);
if (o->magic != MAGIC_OBJ_SMART) return; if (o->magic != MAGIC_OBJ_SMART) return;

11
legacy/evas/src/lib/include/evas_inline.x
View File

@ -75,14 +75,13 @@ evas_event_passes_through(Evas_Object *obj)
{ {
if (obj->layer->evas->events_frozen > 0) return 1; if (obj->layer->evas->events_frozen > 0) return 1;
if (obj->pass_events) return 1; if (obj->pass_events) return 1;
if (obj->parent_cache_valid) return obj->parent_pass_events; if (obj->parent_cache.pass_events_valid)
return obj->parent_cache.pass_events;
if (obj->smart.parent) if (obj->smart.parent)
{ {
int par_pass; int par_pass = evas_event_passes_through(obj->smart.parent);
obj->parent_cache.pass_events_valid = 1;
par_pass = evas_event_passes_through(obj->smart.parent); obj->parent_cache.pass_events = par_pass;
obj->parent_cache_valid = 1;
obj->parent_pass_events = par_pass;
return par_pass; return par_pass;
} }
return 0; return 0;

6
legacy/evas/src/lib/include/evas_private.h
View File

@ -570,8 +570,10 @@ struct _Evas_Object
Eina_Bool store : 1; Eina_Bool store : 1;
Eina_Bool pass_events : 1; Eina_Bool pass_events : 1;
Eina_Bool parent_pass_events : 1; struct {
Eina_Bool parent_cache_valid : 1; Eina_Bool pass_events : 1;
Eina_Bool pass_events_valid : 1;
} parent_cache;
Eina_Bool repeat_events : 1; Eina_Bool repeat_events : 1;
Eina_Bool restack : 1; Eina_Bool restack : 1;
Eina_Bool is_active : 1; Eina_Bool is_active : 1;