From: Jean-Philippe Andre Date: Thu, 18 May 2017 08:46:36 +0000 (+0900) Subject: evas: Make beta events from Evas.Canvas internal X-Git-Tag: upstream/1.20.0~1003 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2cdc02b03c3a45c825cdd116a8f348b5673131dd;p=platform%2Fupstream%2Fefl.git evas: Make beta events from Evas.Canvas internal This includes 4 events: - render,flush,pre - render,flush,post - axis,update - viewport,resize Those were not accessible from the EO API since Evas.Canvas isn't part of the public EO API. --- diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h index 29d3e06..5135c1f 100644 --- a/src/lib/evas/Evas_Internal.h +++ b/src/lib/evas/Evas_Internal.h @@ -51,6 +51,17 @@ EAPI Eina_Bool efl_canvas_output_unlock(Efl_Canvas_Output *output); EOAPI void efl_canvas_object_legacy_ctor(Eo *obj); EOAPI void efl_canvas_object_type_set(Eo *obj, const char *type); +EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE; +#define EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE (&(_EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE)) + +EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_POST; +#define EVAS_CANVAS_EVENT_RENDER_FLUSH_POST (&(_EVAS_CANVAS_EVENT_RENDER_FLUSH_POST)) + +EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_AXIS_UPDATE; +#define EVAS_CANVAS_EVENT_AXIS_UPDATE (&(_EVAS_CANVAS_EVENT_AXIS_UPDATE)) + +EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_VIEWPORT_RESIZE; +#define EVAS_CANVAS_EVENT_VIEWPORT_RESIZE (&(_EVAS_CANVAS_EVENT_VIEWPORT_RESIZE)) #ifdef __cplusplus } diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo index c1c58da..9513bc7 100644 --- a/src/lib/evas/canvas/evas_canvas.eo +++ b/src/lib/evas/canvas/evas_canvas.eo @@ -1163,10 +1163,4 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface, Efl.Object.provider_find; Efl.Loop_User.loop { get; } } - events { - render,flush,pre @beta; [[Called on render flush pre phase]] - render,flush,post @beta; [[Called on render flush post phase]] - axis,update @beta; [[Called on axis update]] - viewport,resize @beta; [[Called on viewport resize]] - } } diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index 91757c5..be7a220 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -1184,4 +1184,15 @@ _evas_pointer_list_in_rect_get(Evas_Public_Data *edata, Evas_Object *obj, return list; } +/* Internal EO APIs */ + +EWAPI const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE = + EFL_EVENT_DESCRIPTION("render,flush,pre"); +EWAPI const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_POST = + EFL_EVENT_DESCRIPTION("render,flush,post"); +EWAPI const Efl_Event_Description _EVAS_CANVAS_EVENT_AXIS_UPDATE = + EFL_EVENT_DESCRIPTION("axis,update"); +EWAPI const Efl_Event_Description _EVAS_CANVAS_EVENT_VIEWPORT_RESIZE = + EFL_EVENT_DESCRIPTION("viewport,resize"); + #include "canvas/evas_canvas.eo.c"