summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-07 18:39:32 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-08 12:06:26 -0800
commit0616c31fda2bccd1b413443a5daf02ccb11c578b (patch)
tree96cec2ae5b27c5d258b3908f1e557ba86e883b2b
parent91b84fa2a8d2178fa1ef943da97a1c4bb45a2a4b (diff)
edje: restore edje legacy type that was defined to eo type
Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8247
-rw-r--r--src/lib/edje/Edje_Legacy.h36
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c2
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);
1533 * @{ 1533 * @{
1534 */ 1534 */
1535 1535
1536/** Dragable properties values */ 1536/**
1537typedef Efl_Ui_Drag_Dir Edje_Drag_Dir; 1537 * @defgroup Edje_Part_Drag Edje Drag
1538/** Not dragable */ 1538 *
1539#define EDJE_DRAG_DIR_NONE EFL_UI_DRAG_DIR_NONE 1539 * @brief Functions that deal with dragable parts.
1540/** Dragable horizontally */ 1540 *
1541#define EDJE_DRAG_DIR_X EFL_UI_DRAG_DIR_X 1541 * To create a movable part it must be declared as dragable
1542/** Dragable verically */ 1542 * in EDC file. To do so, one must define a "dragable" block inside
1543#define EDJE_DRAG_DIR_Y EFL_UI_DRAG_DIR_Y 1543 * the "part" block.
1544/** Dragable in both directions */ 1544 *
1545#define EDJE_DRAG_DIR_XY EFL_UI_DRAG_DIR_XY 1545 * These functions are used to set dragging properties to a
1546 * part or get dragging information about it.
1547 *
1548 * @see @ref tutorial_edje_drag
1549 *
1550 * @ingroup Edje_Object_Part
1551 *
1552 * @{
1553 */
1554
1555typedef enum _Edje_Drag_Dir
1556{
1557 EDJE_DRAG_DIR_NONE = 0,
1558 EDJE_DRAG_DIR_X = 1,
1559 EDJE_DRAG_DIR_Y = 2,
1560 EDJE_DRAG_DIR_XY = 3
1561} Edje_Drag_Dir;
1546 1562
1547 1563
1548/** 1564/**
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
702 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 702 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
703 703
704 // Progress bars are dragable types 704 // Progress bars are dragable types
705 if (edje_object_part_drag_dir_get(wd->resize_obj, part) != EFL_UI_DRAG_DIR_NONE) 705 if (edje_object_part_drag_dir_get(wd->resize_obj, part) != (Edje_Drag_Dir)EFL_UI_DRAG_DIR_NONE)
706 return ELM_PART_IMPLEMENT(EFL_UI_PROGRESSBAR_PART_CLASS, obj, part); 706 return ELM_PART_IMPLEMENT(EFL_UI_PROGRESSBAR_PART_CLASS, obj, part);
707 707
708 return efl_part_get(efl_super(obj, MY_CLASS), part); 708 return efl_part_get(efl_super(obj, MY_CLASS), part);