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

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@64371 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/canvas/evas_object_smart.c b/src/lib/canvas/evas_object_smart.c
index 9abaf7f..71e06a0 100644 (file)
--- a/src/lib/canvas/evas_object_smart.c
+++ b/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/src/lib/include/evas_inline.x b/src/lib/include/evas_inline.x
index 429749d..a9787ef 100644 (file)
--- a/src/lib/include/evas_inline.x
+++ b/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/src/lib/include/evas_private.h b/src/lib/include/evas_private.h
index 22dae7d..d0f693d 100644 (file)
--- a/src/lib/include/evas_private.h
+++ b/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;