From 0616c31fda2bccd1b413443a5daf02ccb11c578b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 7 Mar 2019 18:39:32 -0500 Subject: [PATCH] edje: restore edje legacy type that was defined to eo type Reviewed-by: Cedric BAIL Differential Revision: https://phab.enlightenment.org/D8247 --- src/lib/edje/Edje_Legacy.h | 36 ++++++++++++++++++------- src/lib/elementary/efl_ui_progressbar.c | 2 +- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h index 863c9e69be..8f657827a3 100644 --- a/src/lib/edje/Edje_Legacy.h +++ b/src/lib/edje/Edje_Legacy.h @@ -1533,16 +1533,32 @@ EAPI double edje_object_base_scale_get(const Evas_Object *obj); * @{ */ -/** Dragable properties values */ -typedef Efl_Ui_Drag_Dir Edje_Drag_Dir; -/** Not dragable */ -#define EDJE_DRAG_DIR_NONE EFL_UI_DRAG_DIR_NONE -/** Dragable horizontally */ -#define EDJE_DRAG_DIR_X EFL_UI_DRAG_DIR_X -/** Dragable verically */ -#define EDJE_DRAG_DIR_Y EFL_UI_DRAG_DIR_Y -/** Dragable in both directions */ -#define EDJE_DRAG_DIR_XY EFL_UI_DRAG_DIR_XY +/** + * @defgroup Edje_Part_Drag Edje Drag + * + * @brief Functions that deal with dragable parts. + * + * To create a movable part it must be declared as dragable + * in EDC file. To do so, one must define a "dragable" block inside + * the "part" block. + * + * These functions are used to set dragging properties to a + * part or get dragging information about it. + * + * @see @ref tutorial_edje_drag + * + * @ingroup Edje_Object_Part + * + * @{ + */ + +typedef enum _Edje_Drag_Dir +{ + EDJE_DRAG_DIR_NONE = 0, + EDJE_DRAG_DIR_X = 1, + EDJE_DRAG_DIR_Y = 2, + EDJE_DRAG_DIR_XY = 3 +} Edje_Drag_Dir; /** diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index 56ed183031..2d1ecfc230 100644 --- a/src/lib/elementary/efl_ui_progressbar.c +++ b/src/lib/elementary/efl_ui_progressbar.c @@ -702,7 +702,7 @@ _efl_ui_progressbar_efl_part_part_get(const Eo *obj, Efl_Ui_Progressbar_Data *sd ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); // Progress bars are dragable types - if (edje_object_part_drag_dir_get(wd->resize_obj, part) != EFL_UI_DRAG_DIR_NONE) + if (edje_object_part_drag_dir_get(wd->resize_obj, part) != (Edje_Drag_Dir)EFL_UI_DRAG_DIR_NONE) return ELM_PART_IMPLEMENT(EFL_UI_PROGRESSBAR_PART_CLASS, obj, part); return efl_part_get(efl_super(obj, MY_CLASS), part);