summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-12-01 12:50:45 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-12-01 12:50:45 +0900
commit970bcc64d80ef17a4fcfe028aa5aa57f87acd847 (patch)
treeb13dd5ad7829b119f53e9578f2b932aae67f6f87
parentc12ac143c68bf193e5154ca1e0e6471d9a2d7fb2 (diff)
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
-rw-r--r--src/lib/evas/Evas_Eo.h8
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c8
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;
27EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_PRELOADED; 27EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_PRELOADED;
28EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_RESIZE; 28EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_RESIZE;
29EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_UNLOADED; 29EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_UNLOADED;
30EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_RENDER_PRE;
31EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_RENDER_POST;
32 30
33EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_FOCUS_IN; 31EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_FOCUS_IN;
34EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_FOCUS_OUT; 32EAPI 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;
36EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_POST; 34EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_POST;
37EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN; 35EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN;
38EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT; 36EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT;
37EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_PRE;
38EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_POST;
39 39
40// Callbacks events for use with Evas objects 40// Callbacks events for use with Evas objects
41#define EVAS_OBJECT_EVENT_MOUSE_IN (&(_EVAS_OBJECT_EVENT_MOUSE_IN)) 41#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;
63#define EVAS_OBJECT_EVENT_IMAGE_PRELOADED (&(_EVAS_OBJECT_EVENT_IMAGE_PRELOADED)) 63#define EVAS_OBJECT_EVENT_IMAGE_PRELOADED (&(_EVAS_OBJECT_EVENT_IMAGE_PRELOADED))
64#define EVAS_OBJECT_EVENT_IMAGE_RESIZE (&(_EVAS_OBJECT_EVENT_IMAGE_RESIZE)) 64#define EVAS_OBJECT_EVENT_IMAGE_RESIZE (&(_EVAS_OBJECT_EVENT_IMAGE_RESIZE))
65#define EVAS_OBJECT_EVENT_IMAGE_UNLOADED (&(_EVAS_OBJECT_EVENT_IMAGE_UNLOADED)) 65#define EVAS_OBJECT_EVENT_IMAGE_UNLOADED (&(_EVAS_OBJECT_EVENT_IMAGE_UNLOADED))
66#define EVAS_OBJECT_EVENT_RENDER_PRE (&(_EVAS_OBJECT_EVENT_RENDER_PRE))
67#define EVAS_OBJECT_EVENT_RENDER_POST (&(_EVAS_OBJECT_EVENT_RENDER_POST))
68 66
69// Callbacks events for use with Evas canvases 67// Callbacks events for use with Evas canvases
70#define EVAS_CANVAS_EVENT_FOCUS_IN (&(_EVAS_CANVAS_EVENT_FOCUS_IN)) 68#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;
73#define EVAS_CANVAS_EVENT_RENDER_FLUSH_POST (&(_EVAS_CANVAS_EVENT_RENDER_FLUSH_POST)) 71#define EVAS_CANVAS_EVENT_RENDER_FLUSH_POST (&(_EVAS_CANVAS_EVENT_RENDER_FLUSH_POST))
74#define EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN (&(_EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN)) 72#define EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN (&(_EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN))
75#define EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT (&(_EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT)) 73#define EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT (&(_EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT))
74#define EVAS_CANVAS_EVENT_RENDER_PRE (&(_EVAS_CANVAS_EVENT_RENDER_PRE))
75#define EVAS_CANVAS_EVENT_RENDER_POST (&(_EVAS_CANVAS_EVENT_RENDER_POST))
76 76
77EAPI extern const Eo_Event_Description _CLICKED_EVENT; 77EAPI extern const Eo_Event_Description _CLICKED_EVENT;
78EAPI extern const Eo_Event_Description _CLICKED_DOUBLE_EVENT; 78EAPI 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=
57 EO_EVENT_DESCRIPTION("Image Resize", "Image resize"); 57 EO_EVENT_DESCRIPTION("Image Resize", "Image resize");
58EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_UNLOADED = 58EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_IMAGE_UNLOADED =
59 EO_EVENT_DESCRIPTION("Image Unloaded", "Image data has been unloaded (by some mechanism in Evas that throw out original image data)"); 59 EO_EVENT_DESCRIPTION("Image Unloaded", "Image data has been unloaded (by some mechanism in Evas that throw out original image data)");
60EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_RENDER_PRE = 60EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_PRE =
61 EO_EVENT_DESCRIPTION("Render Pre", "Called just before rendering starts on the canvas target @since 1.2"); 61 EO_EVENT_DESCRIPTION("Render Pre", "Called just before rendering starts on the canvas target @since 1.2");
62EAPI const Eo_Event_Description _EVAS_OBJECT_EVENT_RENDER_POST = 62EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_POST =
63 EO_EVENT_DESCRIPTION("Render Post", "Called just after rendering stops on the canvas target @since 1.2"); 63 EO_EVENT_DESCRIPTION("Render Post", "Called just after rendering stops on the canvas target @since 1.2");
64 64
65EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_FOCUS_IN = 65EAPI 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
111 EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN, 111 EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN,
112 EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT, 112 EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT,
113 EVAS_OBJECT_EVENT_IMAGE_UNLOADED, 113 EVAS_OBJECT_EVENT_IMAGE_UNLOADED,
114 EVAS_OBJECT_EVENT_RENDER_PRE, 114 EVAS_CANVAS_EVENT_RENDER_PRE,
115 EVAS_OBJECT_EVENT_RENDER_POST 115 EVAS_CANVAS_EVENT_RENDER_POST
116}; 116};
117 117
118typedef struct 118typedef struct