diff options
| author | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-08-23 13:30:45 +0900 |
|---|---|---|
| committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-08-23 15:24:37 +0900 |
| commit | db4950ba2f2489335583324fa3c646d1dc4393bc (patch) | |
| tree | b95849033fb05f959abcf24e5829e0383518110b | |
| parent | d28510a37bcf993466644d0f0a4d94c9fe949a29 (diff) | |
| download | efl-db4950ba2f2489335583324fa3c646d1dc4393bc.tar.gz | |
efl: Remove Efl.Orientation horiz & vert (EO)
They are now replaced by Efl.Ui.Dir
NOTE: The name Efl.Ui.Dir is not satisfactory. Maybe we should use
Direction_Type or Direction_Value?
Ref T5870
| -rw-r--r-- | src/lib/edje/edje_part_box.c | 12 | ||||
| -rw-r--r-- | src/lib/edje/efl_canvas_layout_internal_box.eo | 4 | ||||
| -rw-r--r-- | src/lib/efl/interfaces/efl_orientation.eo | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/lib/edje/edje_part_box.c b/src/lib/edje/edje_part_box.c index 6e537fecd2..b7b8080c85 100644 --- a/src/lib/edje/edje_part_box.c +++ b/src/lib/edje/edje_part_box.c @@ -195,23 +195,23 @@ _efl_canvas_layout_internal_box_efl_container_content_count(Eo *obj, void *_pd E RETURN_VAL(evas_obj_box_count(pd->rp->object)); } -EOLIAN static Efl_Orient -_efl_canvas_layout_internal_box_efl_orientation_orientation_get(Eo *obj, void *_pd EINA_UNUSED) +EOLIAN static Efl_Ui_Dir +_efl_canvas_layout_internal_box_efl_ui_direction_direction_get(Eo *obj, void *_pd EINA_UNUSED) { PROXY_DATA_GET(obj, pd); const Edje_Part_Description_Box *desc = (Edje_Part_Description_Box *) pd->rp->chosen_description; if (!desc || !desc->box.layout) - RETURN_VAL(EFL_ORIENT_NONE); + RETURN_VAL(EFL_UI_DIR_DEFAULT); if (!strncmp(desc->box.layout, "vertical", 8)) - RETURN_VAL(EFL_ORIENT_VERTICAL); + RETURN_VAL(EFL_UI_DIR_VERTICAL); else if (!strncmp(desc->box.layout, "horizontal", 10)) - RETURN_VAL(EFL_ORIENT_HORIZONTAL); + RETURN_VAL(EFL_UI_DIR_HORIZONTAL); WRN("unknown orientation '%s'", desc->box.layout); - RETURN_VAL(EFL_ORIENT_NONE); + RETURN_VAL(EFL_UI_DIR_DEFAULT); } #include "efl_canvas_layout_internal_box.eo.c" diff --git a/src/lib/edje/efl_canvas_layout_internal_box.eo b/src/lib/edje/efl_canvas_layout_internal_box.eo index 4e96a61ccf..e062c61f09 100644 --- a/src/lib/edje/efl_canvas_layout_internal_box.eo +++ b/src/lib/edje/efl_canvas_layout_internal_box.eo @@ -1,5 +1,5 @@ class Efl.Canvas.Layout_Internal.Box (Efl.Canvas.Layout_Internal, Efl.Pack.Linear, - Efl.Orientation) + Efl.Ui.Direction) { [[Represents a Box created as part of a layout. @@ -23,6 +23,6 @@ class Efl.Canvas.Layout_Internal.Box (Efl.Canvas.Layout_Internal, Efl.Pack.Linea Efl.Pack.Linear.pack_content_get; Efl.Pack.Linear.pack_unpack_at; Efl.Pack.Linear.pack_index_get; - Efl.Orientation.orientation { get; } + Efl.Ui.Direction.direction { get; [[Returns $default if unknown.]] } } } diff --git a/src/lib/efl/interfaces/efl_orientation.eo b/src/lib/efl/interfaces/efl_orientation.eo index fb5f1d8056..8ed69aac55 100644 --- a/src/lib/efl/interfaces/efl_orientation.eo +++ b/src/lib/efl/interfaces/efl_orientation.eo @@ -15,8 +15,6 @@ enum Efl.Orient right = 90, [[Orient right, rotate 90 degrees counter clock-wise.]] down = 180, [[Orient down, rotate 180 degrees.]] left = 270, [[Orient left, rotate 90 degrees clock-wise.]] - vertical = 0, [[Orient vertical]] - horizontal = 90 [[Orient horizontal]] } interface Efl.Orientation |