From 8658d955ce4087fc7e8a7159f9a5c4fc663811a7 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Tue, 25 Oct 2011 02:26:51 +0000 Subject: [PATCH] Evas - Modified field names in Evas structure to be more clear. SVN revision: 64371 --- legacy/evas/src/lib/canvas/evas_object_smart.c | 2 +- legacy/evas/src/lib/include/evas_inline.x | 11 +++++------ legacy/evas/src/lib/include/evas_private.h | 6 ++++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_smart.c b/legacy/evas/src/lib/canvas/evas_object_smart.c index 9abaf7f5f4..71e06a077e 100644 --- a/legacy/evas/src/lib/canvas/evas_object_smart.c +++ b/legacy/evas/src/lib/canvas/evas_object_smart.c @@ -763,7 +763,7 @@ evas_object_smart_member_cache_invalidate(Evas_Object *obj) return; MAGIC_CHECK_END(); - obj->parent_cache_valid = 0; + obj->parent_cache.pass_events_valid = 0; o = (Evas_Object_Smart *)(obj->object_data); if (o->magic != MAGIC_OBJ_SMART) return; diff --git a/legacy/evas/src/lib/include/evas_inline.x b/legacy/evas/src/lib/include/evas_inline.x index 429749dff7..a9787efbff 100644 --- a/legacy/evas/src/lib/include/evas_inline.x +++ b/legacy/evas/src/lib/include/evas_inline.x @@ -75,14 +75,13 @@ evas_event_passes_through(Evas_Object *obj) { if (obj->layer->evas->events_frozen > 0) 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) { - int par_pass; - - par_pass = evas_event_passes_through(obj->smart.parent); - obj->parent_cache_valid = 1; - obj->parent_pass_events = par_pass; + int par_pass = evas_event_passes_through(obj->smart.parent); + obj->parent_cache.pass_events_valid = 1; + obj->parent_cache.pass_events = par_pass; return par_pass; } return 0; diff --git a/legacy/evas/src/lib/include/evas_private.h b/legacy/evas/src/lib/include/evas_private.h index 22dae7d243..d0f693d12b 100644 --- a/legacy/evas/src/lib/include/evas_private.h +++ b/legacy/evas/src/lib/include/evas_private.h @@ -570,8 +570,10 @@ struct _Evas_Object Eina_Bool store : 1; Eina_Bool pass_events : 1; - Eina_Bool parent_pass_events : 1; - Eina_Bool parent_cache_valid : 1; + struct { + Eina_Bool pass_events : 1; + Eina_Bool pass_events_valid : 1; + } parent_cache; Eina_Bool repeat_events : 1; Eina_Bool restack : 1; Eina_Bool is_active : 1;