From ce62dbc1c0635e1c2a1c98c38f6592bb76cb0a1b Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Wed, 28 Aug 2019 14:09:13 +0900 Subject: efl_canvas_vg_object/evas_object_vg: Change to legacy naming rule. Summary: Enum and object decleared in efl_canvas_vg_object_eo.legacy.* use Efl_Canvas_Vg_* nameing rule. This skips the definition of type declared in Efl.Canvas.Vg.Object class. So change these to legacy names. Test Plan: N/A Reviewers: Hermet, smohanty, kimcinoo Reviewed By: Hermet Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9718 --- src/lib/evas/canvas/efl_canvas_vg_object.c | 44 ++++++++++++++++++++++ .../evas/canvas/efl_canvas_vg_object_eo.legacy.c | 24 +++--------- .../evas/canvas/efl_canvas_vg_object_eo.legacy.h | 43 +++++++++------------ 3 files changed, 68 insertions(+), 43 deletions(-) diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.c b/src/lib/evas/canvas/efl_canvas_vg_object.c index 56f892023b..7caa003fce 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_object.c +++ b/src/lib/evas/canvas/efl_canvas_vg_object.c @@ -1015,5 +1015,49 @@ evas_object_vg_file_set(Evas_Object *obj, const char *file, const char *key) return efl_file_simple_load(obj, file, key); } +static inline Efl_Canvas_Vg_Fill_Mode +_evas_object_vg_fill_mode_to_efl_ui_canvas_object_vg_fill_mode(Evas_Object_Vg_Fill_Mode mode) +{ + switch (mode) + { +#define CONVERT_MODE(MODE) case EVAS_OBJECT_VG_FILL_MODE_##MODE: return EFL_CANVAS_VG_FILL_MODE_##MODE + CONVERT_MODE(NONE); + CONVERT_MODE(STRETCH); + CONVERT_MODE(MEET); + CONVERT_MODE(SLICE); + default: break; + } +#undef CONVERT_MODE + return EFL_CANVAS_VG_FILL_MODE_NONE; +} + +static inline Evas_Object_Vg_Fill_Mode +_efl_ui_canvas_object_vg_fill_mode_to_evas_object_vg_fill_mode(Efl_Canvas_Vg_Fill_Mode mode) +{ + switch (mode) + { +#define CONVERT_MODE(MODE) case EFL_CANVAS_VG_FILL_MODE_##MODE: return EVAS_OBJECT_VG_FILL_MODE_##MODE + CONVERT_MODE(NONE); + CONVERT_MODE(STRETCH); + CONVERT_MODE(MEET); + CONVERT_MODE(SLICE); + default: break; + } +#undef CONVERT_MODE + return EVAS_OBJECT_VG_FILL_MODE_NONE; +} + +EAPI void +evas_object_vg_fill_mode_set(Efl_VG *obj, Evas_Object_Vg_Fill_Mode fill_mode) +{ + efl_canvas_vg_object_fill_mode_set(obj, _evas_object_vg_fill_mode_to_efl_ui_canvas_object_vg_fill_mode(fill_mode)); +} + +EAPI Evas_Object_Vg_Fill_Mode +evas_object_vg_fill_mode_get(const Efl_VG *obj) +{ + return _efl_ui_canvas_object_vg_fill_mode_to_evas_object_vg_fill_mode(efl_canvas_vg_object_fill_mode_get(obj)); +} + #include "efl_canvas_vg_object.eo.c" #include "efl_canvas_vg_object_eo.legacy.c" diff --git a/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c b/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c index 095fb3a2b9..936ae0b512 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c +++ b/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c @@ -1,48 +1,36 @@ EAPI void -evas_object_vg_fill_mode_set(Efl_Canvas_Vg_Object *obj, Efl_Canvas_Vg_Fill_Mode fill_mode) -{ - efl_canvas_vg_object_fill_mode_set(obj, fill_mode); -} - -EAPI Efl_Canvas_Vg_Fill_Mode -evas_object_vg_fill_mode_get(const Efl_Canvas_Vg_Object *obj) -{ - return efl_canvas_vg_object_fill_mode_get(obj); -} - -EAPI void -evas_object_vg_viewbox_set(Efl_Canvas_Vg_Object *obj, Eina_Rect viewbox) +evas_object_vg_viewbox_set(Efl_VG *obj, Eina_Rect viewbox) { efl_canvas_vg_object_viewbox_set(obj, viewbox); } EAPI Eina_Rect -evas_object_vg_viewbox_get(const Efl_Canvas_Vg_Object *obj) +evas_object_vg_viewbox_get(const Efl_VG *obj) { return efl_canvas_vg_object_viewbox_get(obj); } EAPI void -evas_object_vg_viewbox_align_set(Efl_Canvas_Vg_Object *obj, double align_x, double align_y) +evas_object_vg_viewbox_align_set(Efl_VG *obj, double align_x, double align_y) { efl_canvas_vg_object_viewbox_align_set(obj, align_x, align_y); } EAPI void -evas_object_vg_viewbox_align_get(const Efl_Canvas_Vg_Object *obj, double *align_x, double *align_y) +evas_object_vg_viewbox_align_get(const Efl_VG *obj, double *align_x, double *align_y) { efl_canvas_vg_object_viewbox_align_get(obj, align_x, align_y); } EAPI void -evas_object_vg_root_node_set(Efl_Canvas_Vg_Object *obj, Efl_Canvas_Vg_Node *root) +evas_object_vg_root_node_set(Efl_VG *obj, Efl_Canvas_Vg_Node *root) { efl_canvas_vg_object_root_node_set(obj, root); } EAPI Efl_Canvas_Vg_Node * -evas_object_vg_root_node_get(const Efl_Canvas_Vg_Object *obj) +evas_object_vg_root_node_get(const Efl_VG *obj) { return efl_canvas_vg_object_root_node_get(obj); } diff --git a/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h b/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h index 2b7e96b52d..02aa449bec 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h +++ b/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h @@ -1,40 +1,33 @@ -#ifndef _EFL_CANVAS_VG_OBJECT_EO_LEGACY_H_ -#define _EFL_CANVAS_VG_OBJECT_EO_LEGACY_H_ +#ifndef _EVAS_OBJECT_VG_EO_LEGACY_H_ +#define _EVAS_OBJECT_VG_EO_LEGACY_H_ -#ifndef _EFL_CANVAS_VG_OBJECT_EO_CLASS_TYPE -#define _EFL_CANVAS_VG_OBJECT_EO_CLASS_TYPE - -typedef Eo Efl_Canvas_Vg_Object; - -#endif - -#ifndef _EFL_CANVAS_VG_OBJECT_EO_TYPES -#define _EFL_CANVAS_VG_OBJECT_EO_TYPES +#ifndef _EVAS_OBJECT_VG_EO_LEGACY_TYPES +#define _EVAS_OBJECT_VG_EO_LEGACY_TYPES /** Enumeration that defines how viewbox will be filled int the vg canvs's * viewport. default Fill_Mode is @c none * - * @ingroup Efl_Canvas_Vg + * @ingroup Evas_Object_Vg_Group */ typedef enum { - EFL_CANVAS_VG_FILL_MODE_NONE = 0, /**< Don't scale the viewbox. Placed it + EVAS_OBJECT_VG_FILL_MODE_NONE = 0, /**< Don't scale the viewbox. Placed it * inside viewport taking align property * into account */ - EFL_CANVAS_VG_FILL_MODE_STRETCH, /**< Scale the viewbox so that it matches the + EVAS_OBJECT_VG_FILL_MODE_STRETCH, /**< Scale the viewbox so that it matches the * canvas viewport. Aaspect ratio might be * changed. */ - EFL_CANVAS_VG_FILL_MODE_MEET, /**< Scale the viewbox so that it fits inside + EVAS_OBJECT_VG_FILL_MODE_MEET, /**< Scale the viewbox so that it fits inside * canvas viewport while maintaining the aspect * ratio. At least one of the dimensions of the * viewbox should be equal to the corresponding * dimension of the viewport. */ - EFL_CANVAS_VG_FILL_MODE_SLICE /**< Scale the viewbox so that it covers the + EVAS_OBJECT_VG_FILL_MODE_SLICE /**< Scale the viewbox so that it covers the * entire canvas viewport while maintaining the * aspect ratio. At least one of the dimensions * of the viewbox should be equal to the * corresponding dimension of the viewport. */ -} Efl_Canvas_Vg_Fill_Mode; +} Evas_Object_Vg_Fill_Mode; #endif @@ -47,7 +40,7 @@ typedef enum * * @ingroup Evas_Object_Vg_Group */ -EAPI void evas_object_vg_fill_mode_set(Efl_Canvas_Vg_Object *obj, Efl_Canvas_Vg_Fill_Mode fill_mode); +EAPI void evas_object_vg_fill_mode_set(Efl_VG *obj, Evas_Object_Vg_Fill_Mode fill_mode); /** * @brief Control how the viewbox is mapped to the vg canvas's viewport. @@ -58,7 +51,7 @@ EAPI void evas_object_vg_fill_mode_set(Efl_Canvas_Vg_Object *obj, Efl_Canvas_Vg_ * * @ingroup Evas_Object_Vg_Group */ -EAPI Efl_Canvas_Vg_Fill_Mode evas_object_vg_fill_mode_get(const Efl_Canvas_Vg_Object *obj); +EAPI Evas_Object_Vg_Fill_Mode evas_object_vg_fill_mode_get(const Efl_VG *obj); /** * @brief Sets the viewbox for the evas vg canvas. viewbox if set should be @@ -69,7 +62,7 @@ EAPI Efl_Canvas_Vg_Fill_Mode evas_object_vg_fill_mode_get(const Efl_Canvas_Vg_Ob * * @ingroup Evas_Object_Vg_Group */ -EAPI void evas_object_vg_viewbox_set(Efl_Canvas_Vg_Object *obj, Eina_Rect viewbox); +EAPI void evas_object_vg_viewbox_set(Efl_VG *obj, Eina_Rect viewbox); /** * @brief Get the current viewbox from the evas_object_vg @@ -80,7 +73,7 @@ EAPI void evas_object_vg_viewbox_set(Efl_Canvas_Vg_Object *obj, Eina_Rect viewbo * * @ingroup Evas_Object_Vg_Group */ -EAPI Eina_Rect evas_object_vg_viewbox_get(const Efl_Canvas_Vg_Object *obj); +EAPI Eina_Rect evas_object_vg_viewbox_get(const Efl_VG *obj); /** * @brief Control how the viewbox is positioned inside the viewport. @@ -91,7 +84,7 @@ EAPI Eina_Rect evas_object_vg_viewbox_get(const Efl_Canvas_Vg_Object *obj); * * @ingroup Evas_Object_Vg_Group */ -EAPI void evas_object_vg_viewbox_align_set(Efl_Canvas_Vg_Object *obj, double align_x, double align_y); +EAPI void evas_object_vg_viewbox_align_set(Efl_VG *obj, double align_x, double align_y); /** * @brief Control how the viewbox is positioned inside the viewport. @@ -102,7 +95,7 @@ EAPI void evas_object_vg_viewbox_align_set(Efl_Canvas_Vg_Object *obj, double ali * * @ingroup Evas_Object_Vg_Group */ -EAPI void evas_object_vg_viewbox_align_get(const Efl_Canvas_Vg_Object *obj, double *align_x, double *align_y); +EAPI void evas_object_vg_viewbox_align_get(const Efl_VG *obj, double *align_x, double *align_y); /** * @brief Set the root node of the evas_object_vg. @@ -117,7 +110,7 @@ EAPI void evas_object_vg_viewbox_align_get(const Efl_Canvas_Vg_Object *obj, doub * * @ingroup Evas_Object_Vg_Group */ -EAPI void evas_object_vg_root_node_set(Efl_Canvas_Vg_Object *obj, Efl_Canvas_Vg_Node *root); +EAPI void evas_object_vg_root_node_set(Efl_VG *obj, Efl_Canvas_Vg_Node *root); /** * @brief Get the root node of the evas_object_vg. @@ -130,6 +123,6 @@ EAPI void evas_object_vg_root_node_set(Efl_Canvas_Vg_Object *obj, Efl_Canvas_Vg_ * * @ingroup Evas_Object_Vg_Group */ -EAPI Efl_Canvas_Vg_Node *evas_object_vg_root_node_get(const Efl_Canvas_Vg_Object *obj); +EAPI Efl_Canvas_Vg_Node *evas_object_vg_root_node_get(const Efl_VG *obj); #endif -- cgit v1.2.1