From 970bcc64d80ef17a4fcfe028aa5aa57f87acd847 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Sun, 1 Dec 2013 12:50:45 +0900 Subject: [PATCH] evas - pre/post render events are for canvas not object the eo event naming was wrong for pre/post render event callbacks. they are for the canvas as a whole, not per object --- src/lib/evas/Evas_Eo.h | 8 ++++---- src/lib/evas/canvas/evas_callbacks.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index ada41e76f9..02cc416088 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -27,8 +27,6 @@ EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_CHANGED_SIZE_HINTS; EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_PRELOADED; EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_RESIZE; EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_UNLOADED; -EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_RENDER_PRE; -EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_RENDER_POST; EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_FOCUS_IN; EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_FOCUS_OUT; @@ -36,6 +34,8 @@ EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE; EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_POST; EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN; EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT; +EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_PRE; +EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_POST; // Callbacks events for use with Evas objects #define EVAS_OBJECT_EVENT_MOUSE_IN (&(_EVAS_OBJECT_EVENT_MOUSE_IN)) @@ -63,8 +63,6 @@ EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT; #define EVAS_OBJECT_EVENT_IMAGE_PRELOADED (&(_EVAS_OBJECT_EVENT_IMAGE_PRELOADED)) #define EVAS_OBJECT_EVENT_IMAGE_RESIZE (&(_EVAS_OBJECT_EVENT_IMAGE_RESIZE)) #define EVAS_OBJECT_EVENT_IMAGE_UNLOADED (&(_EVAS_OBJECT_EVENT_IMAGE_UNLOADED)) -#define EVAS_OBJECT_EVENT_RENDER_PRE (&(_EVAS_OBJECT_EVENT_RENDER_PRE)) -#define EVAS_OBJECT_EVENT_RENDER_POST (&(_EVAS_OBJECT_EVENT_RENDER_POST)) // Callbacks events for use with Evas canvases #define EVAS_CANVAS_EVENT_FOCUS_IN (&(_EVAS_CANVAS_EVENT_FOCUS_IN)) @@ -73,6 +71,8 @@ EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT; #define EVAS_CANVAS_EVENT_RENDER_FLUSH_POST (&(_EVAS_CANVAS_EVENT_RENDER_FLUSH_POST)) #define EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN (&(_EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN)) #define EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT (&(_EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT)) +#define EVAS_CANVAS_EVENT_RENDER_PRE (&(_EVAS_CANVAS_EVENT_RENDER_PRE)) +#define EVAS_CANVAS_EVENT_RENDER_POST (&(_EVAS_CANVAS_EVENT_RENDER_POST)) EAPI extern const Eo_Event_Description _CLICKED_EVENT; EAPI extern const Eo_Event_Description _CLICKED_DOUBLE_EVENT; diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index 8dbdfe8cbe..654c5d033a 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -57,9 +57,9 @@ EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_RESIZE= EO_EVENT_DESCRIPTION("Image Resize", "Image resize"); EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_UNLOADED = EO_EVENT_DESCRIPTION("Image Unloaded", "Image data has been unloaded (by some mechanism in Evas that throw out original image data)"); -EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_RENDER_PRE = +EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_PRE = EO_EVENT_DESCRIPTION("Render Pre", "Called just before rendering starts on the canvas target @since 1.2"); -EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_RENDER_POST = +EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_POST = EO_EVENT_DESCRIPTION("Render Post", "Called just after rendering stops on the canvas target @since 1.2"); EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_FOCUS_IN = @@ -111,8 +111,8 @@ static const Eo_Event_Description *_legacy_evas_callback_table[EVAS_CALLBACK_LAS EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN, EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT, EVAS_OBJECT_EVENT_IMAGE_UNLOADED, - EVAS_OBJECT_EVENT_RENDER_PRE, - EVAS_OBJECT_EVENT_RENDER_POST + EVAS_CANVAS_EVENT_RENDER_PRE, + EVAS_CANVAS_EVENT_RENDER_POST }; typedef struct -- 2.34.1