summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-23 13:30:45 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-08-23 15:24:37 +0900
commitdb4950ba2f2489335583324fa3c646d1dc4393bc (patch)
treeb95849033fb05f959abcf24e5829e0383518110b
parentd28510a37bcf993466644d0f0a4d94c9fe949a29 (diff)
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.c12
-rw-r--r--src/lib/edje/efl_canvas_layout_internal_box.eo4
-rw-r--r--src/lib/efl/interfaces/efl_orientation.eo2
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
195 RETURN_VAL(evas_obj_box_count(pd->rp->object)); 195 RETURN_VAL(evas_obj_box_count(pd->rp->object));
196} 196}
197 197
198EOLIAN static Efl_Orient 198EOLIAN static Efl_Ui_Dir
199_efl_canvas_layout_internal_box_efl_orientation_orientation_get(Eo *obj, void *_pd EINA_UNUSED) 199_efl_canvas_layout_internal_box_efl_ui_direction_direction_get(Eo *obj, void *_pd EINA_UNUSED)
200{ 200{
201 PROXY_DATA_GET(obj, pd); 201 PROXY_DATA_GET(obj, pd);
202 const Edje_Part_Description_Box *desc = 202 const Edje_Part_Description_Box *desc =
203 (Edje_Part_Description_Box *) pd->rp->chosen_description; 203 (Edje_Part_Description_Box *) pd->rp->chosen_description;
204 204
205 if (!desc || !desc->box.layout) 205 if (!desc || !desc->box.layout)
206 RETURN_VAL(EFL_ORIENT_NONE); 206 RETURN_VAL(EFL_UI_DIR_DEFAULT);
207 207
208 if (!strncmp(desc->box.layout, "vertical", 8)) 208 if (!strncmp(desc->box.layout, "vertical", 8))
209 RETURN_VAL(EFL_ORIENT_VERTICAL); 209 RETURN_VAL(EFL_UI_DIR_VERTICAL);
210 else if (!strncmp(desc->box.layout, "horizontal", 10)) 210 else if (!strncmp(desc->box.layout, "horizontal", 10))
211 RETURN_VAL(EFL_ORIENT_HORIZONTAL); 211 RETURN_VAL(EFL_UI_DIR_HORIZONTAL);
212 212
213 WRN("unknown orientation '%s'", desc->box.layout); 213 WRN("unknown orientation '%s'", desc->box.layout);
214 RETURN_VAL(EFL_ORIENT_NONE); 214 RETURN_VAL(EFL_UI_DIR_DEFAULT);
215} 215}
216 216
217#include "efl_canvas_layout_internal_box.eo.c" 217#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 @@
1class Efl.Canvas.Layout_Internal.Box (Efl.Canvas.Layout_Internal, Efl.Pack.Linear, 1class Efl.Canvas.Layout_Internal.Box (Efl.Canvas.Layout_Internal, Efl.Pack.Linear,
2 Efl.Orientation) 2 Efl.Ui.Direction)
3{ 3{
4 [[Represents a Box created as part of a layout. 4 [[Represents a Box created as part of a layout.
5 5
@@ -23,6 +23,6 @@ class Efl.Canvas.Layout_Internal.Box (Efl.Canvas.Layout_Internal, Efl.Pack.Linea
23 Efl.Pack.Linear.pack_content_get; 23 Efl.Pack.Linear.pack_content_get;
24 Efl.Pack.Linear.pack_unpack_at; 24 Efl.Pack.Linear.pack_unpack_at;
25 Efl.Pack.Linear.pack_index_get; 25 Efl.Pack.Linear.pack_index_get;
26 Efl.Orientation.orientation { get; } 26 Efl.Ui.Direction.direction { get; [[Returns $default if unknown.]] }
27 } 27 }
28} 28}
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
15 right = 90, [[Orient right, rotate 90 degrees counter clock-wise.]] 15 right = 90, [[Orient right, rotate 90 degrees counter clock-wise.]]
16 down = 180, [[Orient down, rotate 180 degrees.]] 16 down = 180, [[Orient down, rotate 180 degrees.]]
17 left = 270, [[Orient left, rotate 90 degrees clock-wise.]] 17 left = 270, [[Orient left, rotate 90 degrees clock-wise.]]
18 vertical = 0, [[Orient vertical]]
19 horizontal = 90 [[Orient horizontal]]
20} 18}
21 19
22interface Efl.Orientation 20interface Efl.Orientation