efl.gfx.image: namespace events for this class

Reviewers: segfaultxavi

Reviewed By: segfaultxavi

Subscribers: segfaultxavi, cedric, #reviewers, #committers

Tags: #efl_api

Differential Revision: https://phab.enlightenment.org/D8257

diff --git a/src/lib/efl/interfaces/efl_gfx_image.eo b/src/lib/efl/interfaces/efl_gfx_image.eo
index 11eb6bf..3167b3e 100644 (file)
--- a/src/lib/efl/interfaces/efl_gfx_image.eo
+++ b/src/lib/efl/interfaces/efl_gfx_image.eo
@@ -213,9 +213,9 @@ interface @beta Efl.Gfx.Image
       }
    }
    events {
-      preload: void; [[Image data has been preloaded.]]
-      resize: void;  [[Image was resized (its pixel data).]]
-      unload: void;  [[Image data has been unloaded (by some mechanism in
+      image,preload: void; [[Image data has been preloaded.]]
+      image,resize: void;  [[Image was resized (its pixel data).]]
+      image,unload: void;  [[Image data has been unloaded (by some mechanism in
                        EFL that threw out the original image data).]]
    }
 }

diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 724eaa3..f5dbb15 100644 (file)
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -56,17 +56,17 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, EVAS_CALLBACK_LAST,
                       EVAS_OBJECT_EVENT_DEL,
                       EFL_EVENT_HOLD,
                       EFL_GFX_ENTITY_EVENT_HINTS_CHANGED,
-                      EFL_GFX_IMAGE_EVENT_PRELOAD,
+                      EFL_GFX_IMAGE_EVENT_IMAGE_PRELOAD,
                       EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_IN,
                       EFL_CANVAS_SCENE_EVENT_SCENE_FOCUS_OUT,
                       EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE,
                       EVAS_CANVAS_EVENT_RENDER_FLUSH_POST,
                       EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_IN,
                       EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_OUT,
-                      EFL_GFX_IMAGE_EVENT_UNLOAD,
+                      EFL_GFX_IMAGE_EVENT_IMAGE_UNLOAD,
                       EFL_CANVAS_SCENE_EVENT_RENDER_PRE,
                       EFL_CANVAS_SCENE_EVENT_RENDER_POST,
-                      EFL_GFX_IMAGE_EVENT_RESIZE,
+                      EFL_GFX_IMAGE_EVENT_IMAGE_RESIZE,
                       EFL_CANVAS_SCENE_EVENT_DEVICE_CHANGED,
                       EFL_EVENT_POINTER_AXIS,
                       EVAS_CANVAS_EVENT_VIEWPORT_RESIZE );

diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c
index 8e1ea01..f13b3bf 100644 (file)
--- a/src/lib/evas/canvas/evas_object_inform.c
+++ b/src/lib/evas/canvas/evas_object_inform.c
@@ -93,7 +93,7 @@ evas_object_inform_call_image_preloaded(Evas_Object *eo_obj)
        (preload & EVAS_IMAGE_PRELOAD_CANCEL))
      {
         event_id = _evas_object_event_new();
-        evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_PRELOADED, NULL, event_id, EFL_GFX_IMAGE_EVENT_PRELOAD);
+        evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_PRELOADED, NULL, event_id, EFL_GFX_IMAGE_EVENT_IMAGE_PRELOAD);
         _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
      }
 }
@@ -104,7 +104,7 @@ evas_object_inform_call_image_unloaded(Evas_Object *eo_obj)
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    int event_id = _evas_object_event_new();
 
-   evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_UNLOADED, NULL, event_id, EFL_GFX_IMAGE_EVENT_UNLOAD);
+   evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_UNLOADED, NULL, event_id, EFL_GFX_IMAGE_EVENT_IMAGE_UNLOAD);
    _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
 }
 
@@ -114,6 +114,6 @@ evas_object_inform_call_image_resize(Evas_Object *eo_obj)
    Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
    int event_id = _evas_object_event_new();
 
-   evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_RESIZE, NULL, event_id, EFL_GFX_IMAGE_EVENT_RESIZE);
+   evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_IMAGE_RESIZE, NULL, event_id, EFL_GFX_IMAGE_EVENT_IMAGE_RESIZE);
    _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
 }