summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2019-05-24 12:30:31 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-05-24 12:30:32 -0400
commit38d7d33354ce4d13d70f707498c267b120bf2e5a (patch)
tree4b6d9ad3f3e3089b3999d5e10a759fe7f5c73206
parent00851ea53b7d87c2b5be244d4fba0af9253f8039 (diff)
Rename Efl.Ui.Direction -> Efl.Ui.Layout_Orientation
Summary: This clarifies a bit the whole Orientation vs. Direction confusion, at the expense of longer names (Image_Orientation vs. Layout_Orientation). Also, the interfaces are now adjectives (Orientable) and the enums have long names (*_Orientation). Pretty big patch, but no functional changes. Relates to T7863 Test Plan: Everything builds and passes tests. Elementary_tests show same behavior, including the "inverted" widgets, which are the only parts which received a bit of code changes. Proof: https://travis-ci.org/Enlightenment/efl/builds/536277282 Reviewers: zmike, bu5hm4n, cedric Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8946
-rw-r--r--src/Makefile_Efl.am6
-rw-r--r--src/bin/elementary/test_bg.c6
-rw-r--r--src/bin/elementary/test_efl_ui_text.c4
-rw-r--r--src/bin/elementary/test_evas_mask.c4
-rw-r--r--src/bin/elementary/test_evas_snapshot.c2
-rw-r--r--src/bin/elementary/test_events.c2
-rw-r--r--src/bin/elementary/test_gfx_filters.c12
-rw-r--r--src/bin/elementary/test_part_bg.c6
-rw-r--r--src/bin/elementary/test_part_shadow.c4
-rw-r--r--src/bin/elementary/test_photocam.c2
-rw-r--r--src/bin/elementary/test_ui_box.c24
-rw-r--r--src/bin/elementary/test_ui_button.c2
-rw-r--r--src/bin/elementary/test_ui_datepicker.c2
-rw-r--r--src/bin/elementary/test_ui_image.c8
-rw-r--r--src/bin/elementary/test_ui_pager.c4
-rw-r--r--src/bin/elementary/test_ui_pager_scroll.c6
-rw-r--r--src/bin/elementary/test_ui_panes.c2
-rw-r--r--src/bin/elementary/test_ui_progressbar.c2
-rw-r--r--src/bin/elementary/test_ui_relative_layout.c14
-rw-r--r--src/bin/elementary/test_ui_scroller.c4
-rw-r--r--src/bin/elementary/test_ui_slider.c10
-rw-r--r--src/bin/elementary/test_ui_slider_interval.c6
-rw-r--r--src/bin/elementary/test_ui_spin.c2
-rw-r--r--src/bin/elementary/test_ui_spin_button.c4
-rw-r--r--src/bin/elementary/test_ui_tab_pager.c4
-rw-r--r--src/bin/elementary/test_ui_table.c26
-rw-r--r--src/bin/elementary/test_ui_timepicker.c2
-rw-r--r--src/bin/elementary/test_win_inline.c2
-rw-r--r--src/examples/elementary/button_cxx_example_01.cc6
-rw-r--r--src/examples/elementary/efl_ui_grid_example_1.c8
-rw-r--r--src/examples/elementary/efl_ui_list_example_1.c14
-rw-r--r--src/examples/elementary/radio_cxx_example_01.cc2
-rw-r--r--src/examples/elementary/slider_cxx_example.cc4
-rw-r--r--src/lib/edje/edje_part_box.c12
-rw-r--r--src/lib/edje/edje_part_invalid.c2
-rw-r--r--src/lib/edje/efl_canvas_layout_part_box.eo4
-rw-r--r--src/lib/edje/efl_canvas_layout_part_invalid.eo4
-rw-r--r--src/lib/efl/Efl.h4
-rw-r--r--src/lib/efl/interfaces/efl_gfx_image_orientable.eo4
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c2
-rw-r--r--src/lib/efl/interfaces/efl_ui_direction.eo48
-rw-r--r--src/lib/efl/interfaces/efl_ui_direction_readonly.c17
-rw-r--r--src/lib/efl/interfaces/efl_ui_direction_readonly.eo6
-rw-r--r--src/lib/efl/interfaces/efl_ui_layout_orientable.eo52
-rw-r--r--src/lib/efl/interfaces/efl_ui_layout_orientable_readonly.c17
-rw-r--r--src/lib/efl/interfaces/efl_ui_layout_orientable_readonly.eo6
-rw-r--r--src/lib/efl/interfaces/meson.build6
-rw-r--r--src/lib/elementary/efl_page_indicator_icon.c2
-rw-r--r--src/lib/elementary/efl_ui_box.c24
-rw-r--r--src/lib/elementary/efl_ui_box.eo4
-rw-r--r--src/lib/elementary/efl_ui_box_flow.c2
-rw-r--r--src/lib/elementary/efl_ui_box_layout.c2
-rw-r--r--src/lib/elementary/efl_ui_box_private.h2
-rw-r--r--src/lib/elementary/efl_ui_datepicker.c6
-rw-r--r--src/lib/elementary/efl_ui_flip.c44
-rw-r--r--src/lib/elementary/efl_ui_flip.eo10
-rw-r--r--src/lib/elementary/efl_ui_grid.c27
-rw-r--r--src/lib/elementary/efl_ui_grid.eo4
-rw-r--r--src/lib/elementary/efl_ui_grid_private.h2
-rw-r--r--src/lib/elementary/efl_ui_layout_pack.c8
-rw-r--r--src/lib/elementary/efl_ui_layout_part_box.eo4
-rw-r--r--src/lib/elementary/efl_ui_list.c21
-rw-r--r--src/lib/elementary/efl_ui_list.eo2
-rw-r--r--src/lib/elementary/efl_ui_panes.c50
-rw-r--r--src/lib/elementary/efl_ui_panes.eo4
-rw-r--r--src/lib/elementary/efl_ui_panes_private.h26
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c67
-rw-r--r--src/lib/elementary/efl_ui_progressbar.eo4
-rw-r--r--src/lib/elementary/efl_ui_progressbar_private.h2
-rw-r--r--src/lib/elementary/efl_ui_slider.c53
-rw-r--r--src/lib/elementary/efl_ui_slider.eo4
-rw-r--r--src/lib/elementary/efl_ui_slider_interval.c6
-rw-r--r--src/lib/elementary/efl_ui_slider_private.h14
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c8
-rw-r--r--src/lib/elementary/efl_ui_spin_button.eo4
-rw-r--r--src/lib/elementary/efl_ui_spin_button_private.h2
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.c4
-rw-r--r--src/lib/elementary/efl_ui_tab_bar_private.h2
-rw-r--r--src/lib/elementary/efl_ui_table.c16
-rw-r--r--src/lib/elementary/efl_ui_table.eo8
-rw-r--r--src/lib/elementary/efl_ui_table_private.h2
-rw-r--r--src/lib/elementary/efl_ui_timepicker.c4
-rw-r--r--src/lib/elementary/elm_colorselector.c2
-rw-r--r--src/lib/elementary/elm_index.c34
-rw-r--r--src/lib/elementary/elm_index_eo.c10
-rw-r--r--src/lib/elementary/elm_priv.h26
-rw-r--r--src/lib/elementary/elm_slider.c90
-rw-r--r--src/lib/elementary/elm_toolbar.c84
-rw-r--r--src/lib/elementary/elm_toolbar_eo.c10
-rw-r--r--src/lib/elementary/elm_widget_index.h2
-rw-r--r--src/lib/elementary/elm_widget_toolbar.h2
-rw-r--r--src/tests/elementary/efl_ui_test_box.c18
-rw-r--r--src/tests/elementary/efl_ui_test_box_flow.c4
-rw-r--r--src/tests/elementary/efl_ui_test_box_stack.c2
-rw-r--r--src/tests/elementary/efl_ui_test_table.c24
95 files changed, 525 insertions, 617 deletions
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 5d4d9352e7..91e46af267 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -57,8 +57,8 @@ efl_eolian_files = \
57 lib/efl/interfaces/efl_pack_linear.eo \ 57 lib/efl/interfaces/efl_pack_linear.eo \
58 lib/efl/interfaces/efl_pack_table.eo \ 58 lib/efl/interfaces/efl_pack_table.eo \
59 lib/efl/interfaces/efl_ui_i18n.eo \ 59 lib/efl/interfaces/efl_ui_i18n.eo \
60 lib/efl/interfaces/efl_ui_direction.eo \ 60 lib/efl/interfaces/efl_ui_layout_orientable.eo \
61 lib/efl/interfaces/efl_ui_direction_readonly.eo \ 61 lib/efl/interfaces/efl_ui_layout_orientable_readonly.eo \
62 lib/efl/interfaces/efl_ui_drag.eo \ 62 lib/efl/interfaces/efl_ui_drag.eo \
63 lib/efl/interfaces/efl_ui_range_display.eo \ 63 lib/efl/interfaces/efl_ui_range_display.eo \
64 lib/efl/interfaces/efl_ui_range_interactive.eo \ 64 lib/efl/interfaces/efl_ui_range_interactive.eo \
@@ -136,7 +136,7 @@ lib/efl/interfaces/efl_file.c \
136lib/efl/interfaces/efl_ui_format.c \ 136lib/efl/interfaces/efl_ui_format.c \
137lib/efl/interfaces/efl_gfx_color.c \ 137lib/efl/interfaces/efl_gfx_color.c \
138lib/efl/interfaces/efl_text_markup_util.c \ 138lib/efl/interfaces/efl_text_markup_util.c \
139lib/efl/interfaces/efl_ui_direction_readonly.c \ 139lib/efl/interfaces/efl_ui_layout_orientable_readonly.c \
140$(NULL) 140$(NULL)
141 141
142lib_efl_libefl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_srcdir)/src/lib/efl @EFL_CFLAGS@ -DEFL_GFX_FILTER_BETA -DEFL_BUILD 142lib_efl_libefl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_srcdir)/src/lib/efl @EFL_CFLAGS@ -DEFL_GFX_FILTER_BETA -DEFL_BUILD
diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c
index 68e2ba9315..a469befe9d 100644
--- a/src/bin/elementary/test_bg.c
+++ b/src/bin/elementary/test_bg.c
@@ -338,7 +338,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
338 efl_ui_win_alpha_set(efl_added, 1)); 338 efl_ui_win_alpha_set(efl_added, 1));
339 339
340 box = efl_add(EFL_UI_BOX_CLASS, win, 340 box = efl_add(EFL_UI_BOX_CLASS, win,
341 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 341 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
342 efl_gfx_hint_weight_set(efl_added, 1, 1), 342 efl_gfx_hint_weight_set(efl_added, 1, 1),
343 efl_content_set(win, efl_added)); 343 efl_content_set(win, efl_added));
344 344
@@ -415,7 +415,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
415 efl_content_set(win, efl_added)); 415 efl_content_set(win, efl_added));
416 416
417 box = efl_add(EFL_UI_BOX_CLASS, win, 417 box = efl_add(EFL_UI_BOX_CLASS, win,
418 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 418 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
419 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND), 419 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND),
420 efl_content_set(win, efl_added)); 420 efl_content_set(win, efl_added));
421 421
@@ -428,7 +428,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
428 efl_pack(box, efl_added)); 428 efl_pack(box, efl_added));
429 429
430 hbox = efl_add(EFL_UI_BOX_CLASS, box, 430 hbox = efl_add(EFL_UI_BOX_CLASS, box,
431 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 431 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
432 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0), 432 efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0),
433 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), 433 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE),
434 efl_pack(box, efl_added)); 434 efl_pack(box, efl_added));
diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c
index 120eca7a81..9993204468 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -180,7 +180,7 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
180 180
181 bx2 = efl_add(EFL_UI_BOX_CLASS, bx); 181 bx2 = efl_add(EFL_UI_BOX_CLASS, bx);
182 efl_gfx_hint_weight_set(bx2, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); 182 efl_gfx_hint_weight_set(bx2, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
183 efl_ui_direction_set(bx2, EFL_UI_DIR_HORIZONTAL); 183 efl_ui_layout_orientation_set(bx2, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
184 184
185 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); 185 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
186 efl_text_set(bt, "Sel"); 186 efl_text_set(bt, "Sel");
@@ -372,7 +372,7 @@ test_ui_text_item_factory(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
372 372
373 bx2 = efl_add(EFL_UI_BOX_CLASS, bx); 373 bx2 = efl_add(EFL_UI_BOX_CLASS, bx);
374 efl_gfx_hint_weight_set(bx2, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); 374 efl_gfx_hint_weight_set(bx2, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
375 efl_ui_direction_set(bx2, EFL_UI_DIR_HORIZONTAL); 375 efl_ui_layout_orientation_set(bx2, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
376 376
377 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); 377 bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
378 efl_text_set(bt, "Image"); 378 efl_text_set(bt, "Image");
diff --git a/src/bin/elementary/test_evas_mask.c b/src/bin/elementary/test_evas_mask.c
index 0afdb78649..ed18d0fdc9 100644
--- a/src/bin/elementary/test_evas_mask.c
+++ b/src/bin/elementary/test_evas_mask.c
@@ -110,7 +110,7 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
110 efl_ui_win_autodel_set(efl_added, 1)); 110 efl_ui_win_autodel_set(efl_added, 1));
111 111
112 box = efl_add(EFL_UI_BOX_CLASS, win, 112 box = efl_add(EFL_UI_BOX_CLASS, win,
113 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL)); 113 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
114 efl_content_set(win, box); 114 efl_content_set(win, box);
115 115
116 // FIXME: No API to set background as "tile" :( 116 // FIXME: No API to set background as "tile" :(
@@ -151,7 +151,7 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
151 efl_content_set(efl_part(ly, "content"), gl); 151 efl_content_set(efl_part(ly, "content"), gl);
152 152
153 box2 = efl_add(EFL_UI_BOX_CLASS, win, 153 box2 = efl_add(EFL_UI_BOX_CLASS, win,
154 efl_ui_direction_set(efl_added, EFL_UI_DIR_LTR), 154 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
155 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), 155 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
156 efl_pack(box, efl_added)); 156 efl_pack(box, efl_added));
157 157
diff --git a/src/bin/elementary/test_evas_snapshot.c b/src/bin/elementary/test_evas_snapshot.c
index 0d77307c03..4cb8ed1b53 100644
--- a/src/bin/elementary/test_evas_snapshot.c
+++ b/src/bin/elementary/test_evas_snapshot.c
@@ -176,7 +176,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
176 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _radius_set, win)); 176 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _radius_set, win));
177 177
178 box = efl_add(EFL_UI_BOX_CLASS, win, 178 box = efl_add(EFL_UI_BOX_CLASS, win,
179 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 179 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
180 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), 180 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE),
181 efl_pack_table(table, efl_added, 0, TABLE_SIZE + 1, TABLE_SIZE, 1)); 181 efl_pack_table(table, efl_added, 0, TABLE_SIZE + 1, TABLE_SIZE, 1));
182 182
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index e81fca52e2..0e274e4456 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -197,7 +197,7 @@ test_events(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
197 elm_win_autodel_set(win, EINA_TRUE); 197 elm_win_autodel_set(win, EINA_TRUE);
198 198
199 bx = efl_add(EFL_UI_BOX_CLASS, win, 199 bx = efl_add(EFL_UI_BOX_CLASS, win,
200 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL)); 200 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
201 efl_content_set(win, bx); 201 efl_content_set(win, bx);
202 td->win = win; 202 td->win = win;
203 203
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index a52a95e886..fed75a9359 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -339,13 +339,13 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
339 efl_ui_win_autodel_set(efl_added, 1)); 339 efl_ui_win_autodel_set(efl_added, 1));
340 340
341 box = efl_add(EFL_UI_BOX_CLASS, win, 341 box = efl_add(EFL_UI_BOX_CLASS, win,
342 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL)); 342 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
343 343
344 efl_content_set(win, box); 344 efl_content_set(win, box);
345 345
346 { 346 {
347 box2 = efl_add(EFL_UI_BOX_CLASS, win, 347 box2 = efl_add(EFL_UI_BOX_CLASS, win,
348 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 348 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
349 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), 349 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
350 efl_gfx_hint_align_set(efl_added, 0.5, 0.0), 350 efl_gfx_hint_align_set(efl_added, 0.5, 0.0),
351 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE)); 351 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE));
@@ -384,7 +384,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
384 384
385 { 385 {
386 box2 = efl_add(EFL_UI_BOX_CLASS, win, 386 box2 = efl_add(EFL_UI_BOX_CLASS, win,
387 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 387 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
388 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), 388 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
389 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 389 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
390 efl_gfx_arrangement_content_padding_set(efl_added, 5, 5, 1), 390 efl_gfx_arrangement_content_padding_set(efl_added, 5, 5, 1),
@@ -445,7 +445,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
445 } 445 }
446 446
447 o = split = efl_add(EFL_UI_PANES_CLASS, win, 447 o = split = efl_add(EFL_UI_PANES_CLASS, win,
448 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 448 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL));
449 efl_pack(box, split); 449 efl_pack(box, split);
450 450
451 { 451 {
@@ -453,7 +453,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
453 efl_content_set(efl_part(split, "first"), flip); 453 efl_content_set(efl_part(split, "first"), flip);
454 454
455 box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win, 455 box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win,
456 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 456 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
457 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), 457 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
458 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), 458 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE),
459 efl_gfx_arrangement_content_align_set(efl_added, 0.5, 0.5)); 459 efl_gfx_arrangement_content_align_set(efl_added, 0.5, 0.5));
@@ -469,7 +469,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
469 efl_pack(box2, o); 469 efl_pack(box2, o);
470 470
471 o = box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win, 471 o = box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win,
472 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 472 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
473 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), 473 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
474 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), 474 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE),
475 efl_gfx_arrangement_content_align_set(efl_added, 0.5, 0.5)); 475 efl_gfx_arrangement_content_align_set(efl_added, 0.5, 0.5));
diff --git a/src/bin/elementary/test_part_bg.c b/src/bin/elementary/test_part_bg.c
index 2724870f24..6285947f01 100644
--- a/src/bin/elementary/test_part_bg.c
+++ b/src/bin/elementary/test_part_bg.c
@@ -63,7 +63,7 @@ _create_box_contents(Evas_Object *box)
63 unsigned int i; 63 unsigned int i;
64 64
65 hbox = efl_add(EFL_UI_BOX_CLASS, box, 65 hbox = efl_add(EFL_UI_BOX_CLASS, box,
66 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 66 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
67 efl_gfx_hint_weight_set(efl_added, 1, 1), 67 efl_gfx_hint_weight_set(efl_added, 1, 1),
68 efl_pack_end(box, efl_added)); 68 efl_pack_end(box, efl_added));
69 69
@@ -86,7 +86,7 @@ _create_box_contents(Evas_Object *box)
86 if (!content_class[i]) continue; 86 if (!content_class[i]) continue;
87 87
88 hbox = efl_add(EFL_UI_BOX_CLASS, box, 88 hbox = efl_add(EFL_UI_BOX_CLASS, box,
89 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 89 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
90 efl_pack_end(box, efl_added)); 90 efl_pack_end(box, efl_added));
91 91
92 radio = efl_add(EFL_UI_RADIO_CLASS, hbox, 92 radio = efl_add(EFL_UI_RADIO_CLASS, hbox,
@@ -152,7 +152,7 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
152 efl_content_set(win, efl_added)); 152 efl_content_set(win, efl_added));
153 153
154 hbox = efl_add(EFL_UI_BOX_CLASS, vbox, 154 hbox = efl_add(EFL_UI_BOX_CLASS, vbox,
155 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 155 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
156 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), 156 efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
157 efl_pack_end(vbox, efl_added)); 157 efl_pack_end(vbox, efl_added));
158 158
diff --git a/src/bin/elementary/test_part_shadow.c b/src/bin/elementary/test_part_shadow.c
index a0e1165a7a..44e75143c9 100644
--- a/src/bin/elementary/test_part_shadow.c
+++ b/src/bin/elementary/test_part_shadow.c
@@ -143,7 +143,7 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
143 efl_unref(shadow); 143 efl_unref(shadow);
144 144
145 hbx = efl_add(EFL_UI_BOX_CLASS, win); 145 hbx = efl_add(EFL_UI_BOX_CLASS, win);
146 efl_ui_direction_set(hbx, EFL_UI_DIR_HORIZONTAL); 146 efl_ui_layout_orientation_set(hbx, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
147 efl_gfx_hint_weight_set(hbx, EFL_GFX_HINT_EXPAND, 0); 147 efl_gfx_hint_weight_set(hbx, EFL_GFX_HINT_EXPAND, 0);
148 efl_pack(bx, hbx); 148 efl_pack(bx, hbx);
149 149
@@ -176,7 +176,7 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
176 efl_unref(shadow); 176 efl_unref(shadow);
177 177
178 bt_bx = efl_add(EFL_UI_BOX_CLASS, win); 178 bt_bx = efl_add(EFL_UI_BOX_CLASS, win);
179 efl_ui_direction_set(bt_bx, EFL_UI_DIR_HORIZONTAL); 179 efl_ui_layout_orientation_set(bt_bx, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
180 efl_gfx_hint_weight_set(bt_bx, EFL_GFX_HINT_EXPAND, 0); 180 efl_gfx_hint_weight_set(bt_bx, EFL_GFX_HINT_EXPAND, 0);
181 efl_pack(bx, bt_bx); 181 efl_pack(bx, bt_bx);
182 182
diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
index cbfb79a43e..4e79fecf81 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -811,7 +811,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
811 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 811 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
812 812
813 bx = efl_add(EFL_UI_BOX_CLASS, win, 813 bx = efl_add(EFL_UI_BOX_CLASS, win,
814 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN), 814 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
815 efl_content_set(win, efl_added)); 815 efl_content_set(win, efl_added));
816 816
817 efl_add(EFL_UI_TEXT_CLASS, bx, 817 efl_add(EFL_UI_TEXT_CLASS, bx,
diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c
index 7423c2df5e..4c37b8789e 100644
--- a/src/bin/elementary/test_ui_box.c
+++ b/src/bin/elementary/test_ui_box.c
@@ -158,7 +158,7 @@ flow_check_cb(void *data, const Efl_Event *event)
158 efl_del(box); 158 efl_del(box);
159 159
160 box = efl_add(chk ? EFL_UI_BOX_FLOW_CLASS : EFL_UI_BOX_CLASS, win, 160 box = efl_add(chk ? EFL_UI_BOX_FLOW_CLASS : EFL_UI_BOX_CLASS, win,
161 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 161 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL));
162 efl_content_set(parent, box); 162 efl_content_set(parent, box);
163 efl_key_wref_set(win, "box", box); 163 efl_key_wref_set(win, "box", box);
164 164
@@ -171,7 +171,7 @@ horiz_check_cb(void *data, const Efl_Event *event)
171{ 171{
172 Eina_Bool chk = elm_check_selected_get(event->object); 172 Eina_Bool chk = elm_check_selected_get(event->object);
173 Eo *box = efl_key_wref_get(data, "box"); 173 Eo *box = efl_key_wref_get(data, "box");
174 efl_ui_direction_set(box, chk ? EFL_UI_DIR_HORIZONTAL : EFL_UI_DIR_VERTICAL); 174 efl_ui_layout_orientation_set(box, chk ? EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL : EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
175} 175}
176 176
177static void 177static void
@@ -239,7 +239,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
239 efl_gfx_entity_size_set(win, EINA_SIZE2D(600, 400)); 239 efl_gfx_entity_size_set(win, EINA_SIZE2D(600, 400));
240 240
241 vbox = efl_add(EFL_UI_BOX_CLASS, win, 241 vbox = efl_add(EFL_UI_BOX_CLASS, win,
242 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 242 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
243 efl_gfx_arrangement_content_padding_set(vbox, 10, 10, EINA_TRUE); 243 efl_gfx_arrangement_content_padding_set(vbox, 10, 10, EINA_TRUE);
244 efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5); 244 efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5);
245 elm_win_resize_object_add(win, vbox); 245 elm_win_resize_object_add(win, vbox);
@@ -254,14 +254,14 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
254 efl_gfx_entity_visible_set(f, 1); 254 efl_gfx_entity_visible_set(f, 1);
255 255
256 hbox = efl_add(EFL_UI_BOX_CLASS, win, 256 hbox = efl_add(EFL_UI_BOX_CLASS, win,
257 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 257 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL));
258 efl_content_set(f, hbox); 258 efl_content_set(f, hbox);
259 efl_gfx_arrangement_content_padding_set(hbox, 10, 0, EINA_TRUE); 259 efl_gfx_arrangement_content_padding_set(hbox, 10, 0, EINA_TRUE);
260 260
261 261
262 /* weights radio group */ 262 /* weights radio group */
263 bx = efl_add(EFL_UI_BOX_CLASS, win, 263 bx = efl_add(EFL_UI_BOX_CLASS, win,
264 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 264 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
265 efl_gfx_hint_align_set(bx, 0, 0.5); 265 efl_gfx_hint_align_set(bx, 0, 0.5);
266 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 266 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
267 efl_pack(hbox, bx); 267 efl_pack(hbox, bx);
@@ -315,7 +315,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
315 315
316 /* misc */ 316 /* misc */
317 bx = efl_add(EFL_UI_BOX_CLASS, win, 317 bx = efl_add(EFL_UI_BOX_CLASS, win,
318 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 318 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
319 efl_gfx_hint_align_set(bx, 0, 0.5); 319 efl_gfx_hint_align_set(bx, 0, 0.5);
320 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 320 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
321 efl_gfx_hint_weight_set(bx, 0, 1); 321 efl_gfx_hint_weight_set(bx, 0, 1);
@@ -362,7 +362,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
362 362
363 /* user min size setter */ 363 /* user min size setter */
364 bx = efl_add(EFL_UI_BOX_CLASS, win, 364 bx = efl_add(EFL_UI_BOX_CLASS, win,
365 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 365 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
366 efl_gfx_hint_align_set(bx, 0, 0.5); 366 efl_gfx_hint_align_set(bx, 0, 0.5);
367 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 367 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
368 efl_gfx_hint_weight_set(bx, 0, 1); 368 efl_gfx_hint_weight_set(bx, 0, 1);
@@ -389,7 +389,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
389 389
390 /* inner box padding */ 390 /* inner box padding */
391 bx = efl_add(EFL_UI_BOX_CLASS, win, 391 bx = efl_add(EFL_UI_BOX_CLASS, win,
392 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 392 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
393 efl_gfx_hint_align_set(bx, 0, 0.5); 393 efl_gfx_hint_align_set(bx, 0, 0.5);
394 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 394 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
395 efl_gfx_hint_weight_set(bx, 0, 1); 395 efl_gfx_hint_weight_set(bx, 0, 1);
@@ -416,7 +416,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
416 416
417 /* outer margin */ 417 /* outer margin */
418 bx = efl_add(EFL_UI_BOX_CLASS, win, 418 bx = efl_add(EFL_UI_BOX_CLASS, win,
419 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 419 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
420 efl_gfx_hint_align_set(bx, 0, 0.5); 420 efl_gfx_hint_align_set(bx, 0, 0.5);
421 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 421 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
422 efl_gfx_hint_weight_set(bx, 0, 1); 422 efl_gfx_hint_weight_set(bx, 0, 1);
@@ -443,7 +443,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
443 443
444 /* Box align */ 444 /* Box align */
445 bx = efl_add(EFL_UI_BOX_CLASS, win, 445 bx = efl_add(EFL_UI_BOX_CLASS, win,
446 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 446 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
447 efl_gfx_hint_align_set(bx, 0, 0.5); 447 efl_gfx_hint_align_set(bx, 0, 0.5);
448 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 448 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
449 efl_gfx_hint_weight_set(bx, 1, 1); 449 efl_gfx_hint_weight_set(bx, 1, 1);
@@ -483,7 +483,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
483 483
484 /* Button align */ 484 /* Button align */
485 bx = efl_add(EFL_UI_BOX_CLASS, win, 485 bx = efl_add(EFL_UI_BOX_CLASS, win,
486 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 486 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
487 efl_gfx_hint_align_set(bx, 0, 0.5); 487 efl_gfx_hint_align_set(bx, 0, 0.5);
488 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 488 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
489 efl_gfx_hint_weight_set(bx, 1, 1); 489 efl_gfx_hint_weight_set(bx, 1, 1);
@@ -531,7 +531,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
531 efl_gfx_entity_visible_set(f, 1); 531 efl_gfx_entity_visible_set(f, 1);
532 532
533 bx = efl_add(EFL_UI_BOX_CLASS, win, 533 bx = efl_add(EFL_UI_BOX_CLASS, win,
534 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 534 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL));
535 efl_key_wref_set(win, "box", bx); 535 efl_key_wref_set(win, "box", bx);
536 efl_gfx_arrangement_content_padding_set(bx, 10, 10, EINA_TRUE); 536 efl_gfx_arrangement_content_padding_set(bx, 10, 10, EINA_TRUE);
537 efl_gfx_hint_align_set(bx, 0.5, 0.5); 537 efl_gfx_hint_align_set(bx, 0.5, 0.5);
diff --git a/src/bin/elementary/test_ui_button.c b/src/bin/elementary/test_ui_button.c
index 1696a6d9ee..079f9c66d3 100644
--- a/src/bin/elementary/test_ui_button.c
+++ b/src/bin/elementary/test_ui_button.c
@@ -36,7 +36,7 @@ test_ui_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
36 36
37 bx = efl_add(EFL_UI_BOX_CLASS, win, 37 bx = efl_add(EFL_UI_BOX_CLASS, win,
38 efl_content_set(win, efl_added), 38 efl_content_set(win, efl_added),
39 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 39 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
40 40
41 // Text Only Button 41 // Text Only Button
42 efl_add(EFL_UI_BUTTON_CLASS, bx, 42 efl_add(EFL_UI_BUTTON_CLASS, bx,
diff --git a/src/bin/elementary/test_ui_datepicker.c b/src/bin/elementary/test_ui_datepicker.c
index 3fe625101c..7ca9563f6a 100644
--- a/src/bin/elementary/test_ui_datepicker.c
+++ b/src/bin/elementary/test_ui_datepicker.c
@@ -25,7 +25,7 @@ test_ui_datepicker(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
25 25
26 bx = efl_add(EFL_UI_BOX_CLASS, win, 26 bx = efl_add(EFL_UI_BOX_CLASS, win,
27 efl_content_set(win, efl_added), 27 efl_content_set(win, efl_added),
28 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 28 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
29 29
30 efl_add(EFL_UI_DATEPICKER_CLASS, bx, 30 efl_add(EFL_UI_DATEPICKER_CLASS, bx,
31 efl_ui_datepicker_date_set(efl_added, 1987, 9, 17), 31 efl_ui_datepicker_date_set(efl_added, 1987, 9, 17),
diff --git a/src/bin/elementary/test_ui_image.c b/src/bin/elementary/test_ui_image.c
index fe3c335338..38d732f864 100644
--- a/src/bin/elementary/test_ui_image.c
+++ b/src/bin/elementary/test_ui_image.c
@@ -353,7 +353,7 @@ test_remote_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_i
353 } 353 }
354 354
355 box2 = o = efl_add(EFL_UI_BOX_CLASS, box); 355 box2 = o = efl_add(EFL_UI_BOX_CLASS, box);
356 efl_ui_direction_set(o, EFL_UI_DIR_RIGHT); 356 efl_ui_layout_orientation_set(o, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
357 efl_gfx_hint_weight_set(o, 1.0, 0); 357 efl_gfx_hint_weight_set(o, 1.0, 0);
358 efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE); 358 efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE);
359 359
@@ -554,7 +554,7 @@ test_load_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf
554 _create_image(win, EINA_FALSE, EINA_FALSE, EINA_FALSE); 554 _create_image(win, EINA_FALSE, EINA_FALSE, EINA_FALSE);
555 555
556 hbox = efl_add(EFL_UI_BOX_CLASS, win); 556 hbox = efl_add(EFL_UI_BOX_CLASS, win);
557 efl_ui_direction_set(hbox, EFL_UI_DIR_RIGHT); 557 efl_ui_layout_orientation_set(hbox, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
558 efl_gfx_arrangement_content_align_set(hbox, 0, 0.5); 558 efl_gfx_arrangement_content_align_set(hbox, 0, 0.5);
559 efl_gfx_hint_weight_set(hbox, 1.0, 0.0); 559 efl_gfx_hint_weight_set(hbox, 1.0, 0.0);
560 efl_gfx_hint_fill_set(hbox, EINA_TRUE, EINA_FALSE); 560 efl_gfx_hint_fill_set(hbox, EINA_TRUE, EINA_FALSE);
@@ -586,7 +586,7 @@ test_load_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf
586 efl_pack(box, hbox); 586 efl_pack(box, hbox);
587 587
588 hbox = efl_add(EFL_UI_BOX_CLASS, win); 588 hbox = efl_add(EFL_UI_BOX_CLASS, win);
589 efl_ui_direction_set(hbox, EFL_UI_DIR_RIGHT); 589 efl_ui_layout_orientation_set(hbox, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
590 efl_gfx_arrangement_content_align_set(hbox, 0.5, 0.5); 590 efl_gfx_arrangement_content_align_set(hbox, 0.5, 0.5);
591 efl_gfx_hint_weight_set(hbox, 1.0, 0.0); 591 efl_gfx_hint_weight_set(hbox, 1.0, 0.0);
592 efl_gfx_hint_fill_set(hbox, EINA_TRUE, EINA_FALSE), 592 efl_gfx_hint_fill_set(hbox, EINA_TRUE, EINA_FALSE),
@@ -635,7 +635,7 @@ test_ui_image_prescale(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_
635 efl_pack(box, im); 635 efl_pack(box, im);
636 636
637 hbox = efl_add(EFL_UI_BOX_CLASS, win); 637 hbox = efl_add(EFL_UI_BOX_CLASS, win);
638 efl_ui_direction_set(hbox, EFL_UI_DIR_RIGHT); 638 efl_ui_layout_orientation_set(hbox, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
639 efl_gfx_hint_weight_set(hbox, 1.0, 1.0); 639 efl_gfx_hint_weight_set(hbox, 1.0, 1.0);
640 efl_gfx_hint_fill_set(hbox, EINA_TRUE, EINA_TRUE); 640 efl_gfx_hint_fill_set(hbox, EINA_TRUE, EINA_TRUE);
641 641
diff --git a/src/bin/elementary/test_ui_pager.c b/src/bin/elementary/test_ui_pager.c
index 3ca030970a..30c05af08d 100644
--- a/src/bin/elementary/test_ui_pager.c
+++ b/src/bin/elementary/test_ui_pager.c
@@ -449,7 +449,7 @@ static void pack_cb(void *data,
449 449
450 in_box1 = efl_add(EFL_UI_BOX_CLASS, box, 450 in_box1 = efl_add(EFL_UI_BOX_CLASS, box,
451 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 451 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
452 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 452 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL));
453 453
454 sp1 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box1, 454 sp1 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box1,
455 efl_ui_range_min_max_set(efl_added, 0, 455 efl_ui_range_min_max_set(efl_added, 0,
@@ -459,7 +459,7 @@ static void pack_cb(void *data,
459 459
460 in_box2 = efl_add(EFL_UI_BOX_CLASS, box, 460 in_box2 = efl_add(EFL_UI_BOX_CLASS, box,
461 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 461 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
462 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 462 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL));
463 463
464 sp2 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box2); 464 sp2 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box2);
465 465
diff --git a/src/bin/elementary/test_ui_pager_scroll.c b/src/bin/elementary/test_ui_pager_scroll.c
index 604bd7b503..740a8fc3d8 100644
--- a/src/bin/elementary/test_ui_pager_scroll.c
+++ b/src/bin/elementary/test_ui_pager_scroll.c
@@ -531,7 +531,7 @@ static void side_page_num_cb(void *data,
531 efl_ui_format_string_set(efl_part(efl_added, "indicator"), "%1.0f"), 531 efl_ui_format_string_set(efl_part(efl_added, "indicator"), "%1.0f"),
532 efl_ui_range_min_max_set(efl_added, 0, 3), 532 efl_ui_range_min_max_set(efl_added, 0, 3),
533 efl_ui_range_value_set(efl_added, params->side_page_num), 533 efl_ui_range_value_set(efl_added, params->side_page_num),
534 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 534 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
535 efl_gfx_hint_weight_set(efl_added, 1, 1), 535 efl_gfx_hint_weight_set(efl_added, 1, 1),
536 efl_gfx_hint_align_set(efl_added, -1, -1), 536 efl_gfx_hint_align_set(efl_added, -1, -1),
537 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, 537 efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED,
@@ -561,7 +561,7 @@ static void pack_cb(void *data,
561 561
562 in_box1 = efl_add(EFL_UI_BOX_CLASS, box, 562 in_box1 = efl_add(EFL_UI_BOX_CLASS, box,
563 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 563 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
564 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 564 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL));
565 565
566 sp1 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box1, 566 sp1 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box1,
567 efl_ui_range_min_max_set(efl_added, 0, 567 efl_ui_range_min_max_set(efl_added, 0,
@@ -571,7 +571,7 @@ static void pack_cb(void *data,
571 571
572 in_box2 = efl_add(EFL_UI_BOX_CLASS, box, 572 in_box2 = efl_add(EFL_UI_BOX_CLASS, box,
573 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 573 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
574 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 574 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL));
575 575
576 sp2 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box2); 576 sp2 = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box2);
577 577
diff --git a/src/bin/elementary/test_ui_panes.c b/src/bin/elementary/test_ui_panes.c
index a9d0c80606..96f30fbba1 100644
--- a/src/bin/elementary/test_ui_panes.c
+++ b/src/bin/elementary/test_ui_panes.c
@@ -27,7 +27,7 @@ test_panes_minsize(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
27 ); 27 );
28 28
29 panes_h = efl_add(EFL_UI_PANES_CLASS, win, 29 panes_h = efl_add(EFL_UI_PANES_CLASS, win,
30 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 30 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
31 efl_content_set(efl_part(panes, "second"), efl_added) 31 efl_content_set(efl_part(panes, "second"), efl_added)
32 ); 32 );
33 efl_add(EFL_UI_BUTTON_CLASS, win, 33 efl_add(EFL_UI_BUTTON_CLASS, win,
diff --git a/src/bin/elementary/test_ui_progressbar.c b/src/bin/elementary/test_ui_progressbar.c
index e85176998f..ffb7084349 100644
--- a/src/bin/elementary/test_ui_progressbar.c
+++ b/src/bin/elementary/test_ui_progressbar.c
@@ -155,7 +155,7 @@ test_ui_progressbar(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf
155 155
156 btbx = efl_add(EFL_UI_BOX_CLASS, bx, 156 btbx = efl_add(EFL_UI_BOX_CLASS, bx,
157 efl_pack(bx, efl_added), 157 efl_pack(bx, efl_added),
158 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL) 158 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
159 ); 159 );
160 160
161 pd->btn_start = efl_add(EFL_UI_BUTTON_CLASS, btbx, 161 pd->btn_start = efl_add(EFL_UI_BUTTON_CLASS, btbx,
diff --git a/src/bin/elementary/test_ui_relative_layout.c b/src/bin/elementary/test_ui_relative_layout.c
index 6834b66688..35c8adf823 100644
--- a/src/bin/elementary/test_ui_relative_layout.c
+++ b/src/bin/elementary/test_ui_relative_layout.c
@@ -149,7 +149,7 @@ _setter_add(Eo *vbox, Eo *btn, Options option)
149 btn_text = ((to == layout) ? "parent" : (char *)efl_text_get(to)); 149 btn_text = ((to == layout) ? "parent" : (char *)efl_text_get(to));
150 150
151 hbox = efl_add(EFL_UI_BOX_CLASS, vbox, 151 hbox = efl_add(EFL_UI_BOX_CLASS, vbox,
152 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 152 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
153 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2, EINA_TRUE), 153 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2, EINA_TRUE),
154 efl_pack(vbox, efl_added)); 154 efl_pack(vbox, efl_added));
155 155
@@ -191,13 +191,13 @@ _button_frame_add(Eo *box, Eo *btn)
191 efl_pack(box, efl_added)); 191 efl_pack(box, efl_added));
192 192
193 vbox = efl_add(EFL_UI_BOX_CLASS, f, 193 vbox = efl_add(EFL_UI_BOX_CLASS, f,
194 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 194 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
195 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2, EINA_TRUE), 195 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2, EINA_TRUE),
196 efl_gfx_hint_margin_set(efl_added, 2, 2, 2, 2), 196 efl_gfx_hint_margin_set(efl_added, 2, 2, 2, 2),
197 efl_content_set(f, efl_added)); 197 efl_content_set(f, efl_added));
198 198
199 hbox = efl_add(EFL_UI_BOX_CLASS, vbox, 199 hbox = efl_add(EFL_UI_BOX_CLASS, vbox,
200 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 200 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
201 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2, EINA_TRUE), 201 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2, EINA_TRUE),
202 efl_pack(vbox, efl_added)); 202 efl_pack(vbox, efl_added));
203 203
@@ -230,7 +230,7 @@ _button_frame_add(Eo *box, Eo *btn)
230 efl_gfx_hint_align_get(btn, &align_x, &align_y); 230 efl_gfx_hint_align_get(btn, &align_x, &align_y);
231 231
232 hbox = efl_add(EFL_UI_BOX_CLASS, vbox, 232 hbox = efl_add(EFL_UI_BOX_CLASS, vbox,
233 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 233 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
234 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2, EINA_TRUE), 234 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2, EINA_TRUE),
235 efl_pack(vbox, efl_added)); 235 efl_pack(vbox, efl_added));
236 236
@@ -250,7 +250,7 @@ _button_frame_add(Eo *box, Eo *btn)
250 efl_pack(hbox, efl_added)); 250 efl_pack(hbox, efl_added));
251 251
252 hbox = efl_add(EFL_UI_BOX_CLASS, vbox, 252 hbox = efl_add(EFL_UI_BOX_CLASS, vbox,
253 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 253 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
254 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2, EINA_TRUE), 254 efl_gfx_arrangement_content_padding_set(efl_added, 2, 2, EINA_TRUE),
255 efl_pack(vbox, efl_added)); 255 efl_pack(vbox, efl_added));
256 256
@@ -281,7 +281,7 @@ test_ui_relative_layout(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo
281 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 281 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
282 282
283 vbox = efl_add(EFL_UI_BOX_CLASS, win, 283 vbox = efl_add(EFL_UI_BOX_CLASS, win,
284 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 284 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
285 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 285 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
286 efl_gfx_hint_margin_set(efl_added, 5, 5, 5, 5), 286 efl_gfx_hint_margin_set(efl_added, 5, 5, 5, 5),
287 efl_content_set(win, efl_added)); 287 efl_content_set(win, efl_added));
@@ -293,7 +293,7 @@ test_ui_relative_layout(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo
293 efl_pack(vbox, efl_added)); 293 efl_pack(vbox, efl_added));
294 294
295 hbox = efl_add(EFL_UI_BOX_CLASS, f, 295 hbox = efl_add(EFL_UI_BOX_CLASS, f,
296 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 296 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
297 efl_gfx_arrangement_content_padding_set(efl_added, 10, 0, EINA_TRUE), 297 efl_gfx_arrangement_content_padding_set(efl_added, 10, 0, EINA_TRUE),
298 efl_content_set(f, efl_added)); 298 efl_content_set(f, efl_added));
299 299
diff --git a/src/bin/elementary/test_ui_scroller.c b/src/bin/elementary/test_ui_scroller.c
index 9864e77eb9..fc47d0706d 100644
--- a/src/bin/elementary/test_ui_scroller.c
+++ b/src/bin/elementary/test_ui_scroller.c
@@ -44,7 +44,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
44 efl_content_set(win, efl_added)); 44 efl_content_set(win, efl_added));
45 45
46 bx = efl_add(EFL_UI_BOX_CLASS, sc, 46 bx = efl_add(EFL_UI_BOX_CLASS, sc,
47 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN), 47 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
48 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), 48 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0),
49 efl_gfx_hint_align_set(efl_added, 0.5, 0), 49 efl_gfx_hint_align_set(efl_added, 0.5, 0),
50 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 50 efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
@@ -69,7 +69,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
69 efl_pack(bx, efl_added)); 69 efl_pack(bx, efl_added));
70 70
71 bx2 = efl_add(EFL_UI_BOX_CLASS, sc2, 71 bx2 = efl_add(EFL_UI_BOX_CLASS, sc2,
72 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 72 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
73 efl_content_set(sc2, efl_added)); 73 efl_content_set(sc2, efl_added));
74 74
75 for (i = 0; i < 10; i++) 75 for (i = 0; i < 10; i++)
diff --git a/src/bin/elementary/test_ui_slider.c b/src/bin/elementary/test_ui_slider.c
index 305177f453..b91decade4 100644
--- a/src/bin/elementary/test_ui_slider.c
+++ b/src/bin/elementary/test_ui_slider.c
@@ -59,7 +59,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
59 efl_add(EFL_UI_SLIDER_CLASS, bx, 59 efl_add(EFL_UI_SLIDER_CLASS, bx,
60 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 0)), 60 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 0)),
61 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), 61 efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
62 efl_ui_direction_set(efl_added, EFL_UI_DIR_LEFT), 62 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL | EFL_UI_LAYOUT_ORIENTATION_INVERTED),
63 efl_pack(bx, efl_added)); 63 efl_pack(bx, efl_added));
64 64
65 efl_add(EFL_UI_TEXT_CLASS, bx, 65 efl_add(EFL_UI_TEXT_CLASS, bx,
@@ -92,7 +92,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
92 efl_pack(bx, efl_added)); 92 efl_pack(bx, efl_added));
93 93
94 hbx = efl_add(EFL_UI_BOX_CLASS, bx, 94 hbx = efl_add(EFL_UI_BOX_CLASS, bx,
95 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 95 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
96 efl_pack(bx, efl_added)); 96 efl_pack(bx, efl_added));
97 97
98 efl_add(EFL_UI_SLIDER_CLASS, hbx, 98 efl_add(EFL_UI_SLIDER_CLASS, hbx,
@@ -100,14 +100,14 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
100 efl_ui_range_min_max_set(efl_added, 10, 145), 100 efl_ui_range_min_max_set(efl_added, 10, 145),
101 efl_ui_range_step_set(efl_added, step), 101 efl_ui_range_step_set(efl_added, step),
102 efl_ui_range_value_set(efl_added, 70), 102 efl_ui_range_value_set(efl_added, 70),
103 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 103 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
104 efl_pack(hbx, efl_added)); 104 efl_pack(hbx, efl_added));
105 105
106 efl_add(EFL_UI_SLIDER_CLASS, hbx, 106 efl_add(EFL_UI_SLIDER_CLASS, hbx,
107 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)), 107 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)),
108 efl_ui_range_min_max_set(efl_added, 10, 145), 108 efl_ui_range_min_max_set(efl_added, 10, 145),
109 efl_ui_range_step_set(efl_added, step), 109 efl_ui_range_step_set(efl_added, step),
110 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 110 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
111 elm_object_disabled_set(efl_added, EINA_TRUE), 111 elm_object_disabled_set(efl_added, EINA_TRUE),
112 efl_pack(hbx, efl_added)); 112 efl_pack(hbx, efl_added));
113 113
@@ -116,7 +116,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
116 efl_ui_range_min_max_set(efl_added, 10, 145), 116 efl_ui_range_min_max_set(efl_added, 10, 145),
117 efl_ui_range_value_set(efl_added, 35), 117 efl_ui_range_value_set(efl_added, 35),
118 efl_ui_range_step_set(efl_added, step), 118 efl_ui_range_step_set(efl_added, step),
119 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN), 119 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL | EFL_UI_LAYOUT_ORIENTATION_INVERTED),
120 efl_pack(hbx, efl_added)); 120 efl_pack(hbx, efl_added));
121 121
122 efl_add(EFL_UI_TEXT_CLASS, bx, 122 efl_add(EFL_UI_TEXT_CLASS, bx,
diff --git a/src/bin/elementary/test_ui_slider_interval.c b/src/bin/elementary/test_ui_slider_interval.c
index 3e4bdcd2ee..8f0b6c972a 100644
--- a/src/bin/elementary/test_ui_slider_interval.c
+++ b/src/bin/elementary/test_ui_slider_interval.c
@@ -82,7 +82,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
82 efl_pack(bx, efl_added)); 82 efl_pack(bx, efl_added));
83 83
84 hbx = efl_add(EFL_UI_BOX_CLASS, bx, 84 hbx = efl_add(EFL_UI_BOX_CLASS, bx,
85 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 85 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
86 efl_pack(bx, efl_added)); 86 efl_pack(bx, efl_added));
87 87
88 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx, 88 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx,
@@ -90,7 +90,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
90 efl_ui_range_min_max_set(efl_added, 10, 145), 90 efl_ui_range_min_max_set(efl_added, 10, 145),
91 efl_ui_slider_interval_value_set(efl_added, 50, 100), 91 efl_ui_slider_interval_value_set(efl_added, 50, 100),
92 efl_ui_range_step_set(efl_added, step), 92 efl_ui_range_step_set(efl_added, step),
93 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 93 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
94 efl_pack(hbx, efl_added)); 94 efl_pack(hbx, efl_added));
95 95
96 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx, 96 efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx,
@@ -98,7 +98,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
98 efl_ui_range_min_max_set(efl_added, 10, 145), 98 efl_ui_range_min_max_set(efl_added, 10, 145),
99 efl_ui_slider_interval_value_set(efl_added, 50, 100), 99 efl_ui_slider_interval_value_set(efl_added, 50, 100),
100 efl_ui_range_step_set(efl_added, step), 100 efl_ui_range_step_set(efl_added, step),
101 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 101 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
102 elm_object_disabled_set(efl_added, EINA_TRUE), 102 elm_object_disabled_set(efl_added, EINA_TRUE),
103 efl_pack(hbx, efl_added)); 103 efl_pack(hbx, efl_added));
104 104
diff --git a/src/bin/elementary/test_ui_spin.c b/src/bin/elementary/test_ui_spin.c
index 7c606069aa..bf530e36df 100644
--- a/src/bin/elementary/test_ui_spin.c
+++ b/src/bin/elementary/test_ui_spin.c
@@ -44,7 +44,7 @@ test_ui_spin(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
44 44
45 bx = efl_add(EFL_UI_BOX_CLASS, win, 45 bx = efl_add(EFL_UI_BOX_CLASS, win,
46 efl_content_set(win, efl_added), 46 efl_content_set(win, efl_added),
47 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 47 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
48 48
49 sp = efl_add(EFL_UI_SPIN_CLASS, bx, 49 sp = efl_add(EFL_UI_SPIN_CLASS, bx,
50 efl_ui_range_min_max_set(efl_added, 0, 10), 50 efl_ui_range_min_max_set(efl_added, 0, 10),
diff --git a/src/bin/elementary/test_ui_spin_button.c b/src/bin/elementary/test_ui_spin_button.c
index b6e4381dff..293d996526 100644
--- a/src/bin/elementary/test_ui_spin_button.c
+++ b/src/bin/elementary/test_ui_spin_button.c
@@ -35,7 +35,7 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
35 35
36 bx = efl_add(EFL_UI_BOX_CLASS, win, 36 bx = efl_add(EFL_UI_BOX_CLASS, win,
37 efl_content_set(win, efl_added), 37 efl_content_set(win, efl_added),
38 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 38 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
39 39
40 efl_add(EFL_UI_SPIN_BUTTON_CLASS, bx, 40 efl_add(EFL_UI_SPIN_BUTTON_CLASS, bx,
41 efl_ui_range_min_max_set(efl_added, 0, 10), 41 efl_ui_range_min_max_set(efl_added, 0, 10),
@@ -58,7 +58,7 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
58 efl_ui_range_value_set(efl_added, 1), 58 efl_ui_range_value_set(efl_added, 1),
59 efl_ui_spin_button_editable_set(efl_added, EINA_FALSE), 59 efl_ui_spin_button_editable_set(efl_added, EINA_FALSE),
60 efl_ui_spin_special_value_set(efl_added, array), 60 efl_ui_spin_special_value_set(efl_added, array),
61 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 61 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
62 efl_pack(bx, efl_added)); 62 efl_pack(bx, efl_added));
63 eina_array_free(array); 63 eina_array_free(array);
64 64
diff --git a/src/bin/elementary/test_ui_tab_pager.c b/src/bin/elementary/test_ui_tab_pager.c
index b99c150269..00fd21f58d 100644
--- a/src/bin/elementary/test_ui_tab_pager.c
+++ b/src/bin/elementary/test_ui_tab_pager.c
@@ -366,7 +366,7 @@ _pack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
366 366
367 in_box = efl_add(EFL_UI_BOX_CLASS, box, 367 in_box = efl_add(EFL_UI_BOX_CLASS, box,
368 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 368 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
369 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 369 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
370 efl_pack_end(box, efl_added)); 370 efl_pack_end(box, efl_added));
371 371
372 sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box, 372 sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box,
@@ -466,7 +466,7 @@ _unpack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
466 466
467 in_box = efl_add(EFL_UI_BOX_CLASS, box, 467 in_box = efl_add(EFL_UI_BOX_CLASS, box,
468 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 468 efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
469 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), 469 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL),
470 efl_pack_end(box, efl_added)); 470 efl_pack_end(box, efl_added));
471 471
472 sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box, 472 sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, in_box,
diff --git a/src/bin/elementary/test_ui_table.c b/src/bin/elementary/test_ui_table.c
index dab64ddc27..bcaf01559e 100644
--- a/src/bin/elementary/test_ui_table.c
+++ b/src/bin/elementary/test_ui_table.c
@@ -198,7 +198,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
198 efl_gfx_entity_size_set(win, EINA_SIZE2D(600, 400)); 198 efl_gfx_entity_size_set(win, EINA_SIZE2D(600, 400));
199 199
200 vbox = efl_add(EFL_UI_BOX_CLASS, win, 200 vbox = efl_add(EFL_UI_BOX_CLASS, win,
201 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 201 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
202 efl_gfx_arrangement_content_padding_set(vbox, 10, 10, EINA_TRUE); 202 efl_gfx_arrangement_content_padding_set(vbox, 10, 10, EINA_TRUE);
203 efl_gfx_hint_weight_set(vbox, 1, 1); 203 efl_gfx_hint_weight_set(vbox, 1, 1);
204 efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5); 204 efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5);
@@ -218,14 +218,14 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
218 efl_gfx_entity_visible_set(f, 1); 218 efl_gfx_entity_visible_set(f, 1);
219 219
220 hbox = efl_add(EFL_UI_BOX_CLASS, win, 220 hbox = efl_add(EFL_UI_BOX_CLASS, win,
221 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 221 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL));
222 elm_object_content_set(f, hbox); 222 elm_object_content_set(f, hbox);
223 efl_gfx_arrangement_content_padding_set(hbox, 10, 0, EINA_TRUE); 223 efl_gfx_arrangement_content_padding_set(hbox, 10, 0, EINA_TRUE);
224 224
225 225
226 /* weights radio group */ 226 /* weights radio group */
227 bx = efl_add(EFL_UI_BOX_CLASS, win, 227 bx = efl_add(EFL_UI_BOX_CLASS, win,
228 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 228 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
229 efl_gfx_hint_align_set(bx, 0, 0.5); 229 efl_gfx_hint_align_set(bx, 0, 0.5);
230 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 230 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
231 efl_pack(hbox, bx); 231 efl_pack(hbox, bx);
@@ -288,7 +288,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
288 288
289 /* min size setter */ 289 /* min size setter */
290 bx = efl_add(EFL_UI_BOX_CLASS, win, 290 bx = efl_add(EFL_UI_BOX_CLASS, win,
291 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 291 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
292 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 292 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
293 efl_gfx_hint_weight_set(bx, 0, 1); 293 efl_gfx_hint_weight_set(bx, 0, 1);
294 efl_pack(hbox, bx); 294 efl_pack(hbox, bx);
@@ -314,7 +314,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
314 314
315 /* inner box padding */ 315 /* inner box padding */
316 bx = efl_add(EFL_UI_BOX_CLASS, win, 316 bx = efl_add(EFL_UI_BOX_CLASS, win,
317 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 317 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
318 efl_gfx_hint_align_set(bx, 0, 0.5); 318 efl_gfx_hint_align_set(bx, 0, 0.5);
319 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 319 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
320 efl_gfx_hint_weight_set(bx, 0, 1); 320 efl_gfx_hint_weight_set(bx, 0, 1);
@@ -341,7 +341,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
341 341
342 /* outer margin */ 342 /* outer margin */
343 bx = efl_add(EFL_UI_BOX_CLASS, win, 343 bx = efl_add(EFL_UI_BOX_CLASS, win,
344 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 344 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
345 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 345 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
346 efl_gfx_hint_weight_set(bx, 0, 1); 346 efl_gfx_hint_weight_set(bx, 0, 1);
347 efl_pack(hbox, bx); 347 efl_pack(hbox, bx);
@@ -367,7 +367,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
367 367
368 /* button margins */ 368 /* button margins */
369 bx = efl_add(EFL_UI_BOX_CLASS, win, 369 bx = efl_add(EFL_UI_BOX_CLASS, win,
370 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 370 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
371 efl_gfx_hint_align_set(bx, 0, 0.5); 371 efl_gfx_hint_align_set(bx, 0, 0.5);
372 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 372 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
373 efl_gfx_hint_weight_set(bx, 1, 1); 373 efl_gfx_hint_weight_set(bx, 1, 1);
@@ -394,7 +394,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
394 394
395 /* button1 aligns */ 395 /* button1 aligns */
396 bx = efl_add(EFL_UI_BOX_CLASS, win, 396 bx = efl_add(EFL_UI_BOX_CLASS, win,
397 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 397 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
398 efl_gfx_hint_align_set(bx, 0, 0.5); 398 efl_gfx_hint_align_set(bx, 0, 0.5);
399 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 399 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
400 efl_gfx_hint_weight_set(bx, 1, 1); 400 efl_gfx_hint_weight_set(bx, 1, 1);
@@ -431,7 +431,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
431 431
432 /* ro info */ 432 /* ro info */
433 bx = efl_add(EFL_UI_BOX_CLASS, win, 433 bx = efl_add(EFL_UI_BOX_CLASS, win,
434 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 434 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
435 efl_gfx_hint_align_set(bx, 0, 0.5); 435 efl_gfx_hint_align_set(bx, 0, 0.5);
436 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 436 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
437 efl_gfx_hint_weight_set(bx, 1, 1); 437 efl_gfx_hint_weight_set(bx, 1, 1);
@@ -567,7 +567,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
567 efl_gfx_entity_size_set(win, EINA_SIZE2D(600, 400)); 567 efl_gfx_entity_size_set(win, EINA_SIZE2D(600, 400));
568 568
569 vbox = efl_add(EFL_UI_BOX_CLASS, win, 569 vbox = efl_add(EFL_UI_BOX_CLASS, win,
570 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 570 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
571 efl_gfx_arrangement_content_padding_set(vbox, 10, 10, EINA_TRUE); 571 efl_gfx_arrangement_content_padding_set(vbox, 10, 10, EINA_TRUE);
572 efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5); 572 efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5);
573 elm_win_resize_object_add(win, vbox); 573 elm_win_resize_object_add(win, vbox);
@@ -587,7 +587,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
587 efl_gfx_entity_visible_set(f, 1); 587 efl_gfx_entity_visible_set(f, 1);
588 588
589 hbox = efl_add(EFL_UI_BOX_CLASS, win, 589 hbox = efl_add(EFL_UI_BOX_CLASS, win,
590 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 590 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL));
591 elm_object_content_set(f, hbox); 591 elm_object_content_set(f, hbox);
592 efl_gfx_arrangement_content_padding_set(hbox, 5, 0, EINA_TRUE); 592 efl_gfx_arrangement_content_padding_set(hbox, 5, 0, EINA_TRUE);
593 efl_gfx_entity_visible_set(hbox, 1); 593 efl_gfx_entity_visible_set(hbox, 1);
@@ -613,7 +613,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
613 613
614 /* ro info */ 614 /* ro info */
615 bx = efl_add(EFL_UI_BOX_CLASS, win, 615 bx = efl_add(EFL_UI_BOX_CLASS, win,
616 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 616 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
617 efl_gfx_hint_align_set(bx, 0, 0.5); 617 efl_gfx_hint_align_set(bx, 0, 0.5);
618 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); 618 efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE);
619 efl_gfx_hint_weight_set(bx, 1, 1); 619 efl_gfx_hint_weight_set(bx, 1, 1);
@@ -648,7 +648,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
648 efl_gfx_entity_visible_set(f, 1); 648 efl_gfx_entity_visible_set(f, 1);
649 649
650 efl_pack_table_columns_set(table, 4); 650 efl_pack_table_columns_set(table, 4);
651 efl_ui_direction_set(table, EFL_UI_DIR_RIGHT); 651 efl_ui_layout_orientation_set(table, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
652 efl_gfx_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 652 efl_gfx_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
653 elm_object_content_set(f, table); 653 elm_object_content_set(f, table);
654 efl_gfx_entity_visible_set(table, 1); 654 efl_gfx_entity_visible_set(table, 1);
diff --git a/src/bin/elementary/test_ui_timepicker.c b/src/bin/elementary/test_ui_timepicker.c
index 60464d0b00..9572cf0438 100644
--- a/src/bin/elementary/test_ui_timepicker.c
+++ b/src/bin/elementary/test_ui_timepicker.c
@@ -26,7 +26,7 @@ test_ui_timepicker(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
26 26
27 bx = efl_add(EFL_UI_BOX_CLASS, win, 27 bx = efl_add(EFL_UI_BOX_CLASS, win,
28 efl_content_set(win, efl_added), 28 efl_content_set(win, efl_added),
29 efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); 29 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
30 30
31 efl_add(EFL_UI_TIMEPICKER_CLASS, bx, 31 efl_add(EFL_UI_TIMEPICKER_CLASS, bx,
32 efl_ui_timepicker_time_set(efl_added, 11, 35), 32 efl_ui_timepicker_time_set(efl_added, 11, 35),
diff --git a/src/bin/elementary/test_win_inline.c b/src/bin/elementary/test_win_inline.c
index 122f2d474d..ad040dc8c0 100644
--- a/src/bin/elementary/test_win_inline.c
+++ b/src/bin/elementary/test_win_inline.c
@@ -227,7 +227,7 @@ test_win_inline(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even
227 evas_object_show(bg); 227 evas_object_show(bg);
228 228
229 box = efl_add(EFL_UI_BOX_CLASS, win, 229 box = efl_add(EFL_UI_BOX_CLASS, win,
230 efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); 230 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL));
231 elm_win_resize_object_add(win, box); 231 elm_win_resize_object_add(win, box);
232 232
233 win2 = elm_win_add(win, "inlined", ELM_WIN_INLINED_IMAGE); 233 win2 = elm_win_add(win, "inlined", ELM_WIN_INLINED_IMAGE);
diff --git a/src/examples/elementary/button_cxx_example_01.cc b/src/examples/elementary/button_cxx_example_01.cc
index 433290d29b..4c53ba68c2 100644
--- a/src/examples/elementary/button_cxx_example_01.cc
+++ b/src/examples/elementary/button_cxx_example_01.cc
@@ -27,7 +27,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
27 win.content_set(box); 27 win.content_set(box);
28 28
29 efl::ui::Box box_initial(instantiate, win); 29 efl::ui::Box box_initial(instantiate, win);
30 box_initial.direction_set(EFL_UI_DIR_HORIZONTAL); 30 box_initial.orientation_set(EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
31 box_initial.hint_weight_set(EFL_GFX_HINT_EXPAND, 0.0); 31 box_initial.hint_weight_set(EFL_GFX_HINT_EXPAND, 0.0);
32 box.pack_end(box_initial); 32 box.pack_end(box_initial);
33 33
@@ -78,7 +78,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
78 efl::eolian::event_add(efl::ui::Clickable::clicked_event, btn3, btn_options); 78 efl::eolian::event_add(efl::ui::Clickable::clicked_event, btn3, btn_options);
79 79
80 efl::ui::Box box_gap(instantiate, win); 80 efl::ui::Box box_gap(instantiate, win);
81 box_gap.direction_set(EFL_UI_DIR_HORIZONTAL); 81 box_gap.orientation_set(EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
82 box_gap.hint_weight_set(EFL_GFX_HINT_EXPAND, 0.0); 82 box_gap.hint_weight_set(EFL_GFX_HINT_EXPAND, 0.0);
83 box.pack_end(box_gap); 83 box.pack_end(box_gap);
84 84
@@ -174,7 +174,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
174 up.content_set(icon_up); 174 up.content_set(icon_up);
175 175
176 efl::ui::Box box_inferior(instantiate, win); 176 efl::ui::Box box_inferior(instantiate, win);
177 box_inferior.direction_set(EFL_UI_DIR_HORIZONTAL); 177 box_inferior.orientation_set(EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
178 box.pack_end(box_inferior); 178 box.pack_end(box_inferior);
179 box_inferior.visible_set(true); 179 box_inferior.visible_set(true);
180 180
diff --git a/src/examples/elementary/efl_ui_grid_example_1.c b/src/examples/elementary/efl_ui_grid_example_1.c
index 4e41224ae6..47e668a9aa 100644
--- a/src/examples/elementary/efl_ui_grid_example_1.c
+++ b/src/examples/elementary/efl_ui_grid_example_1.c
@@ -19,10 +19,10 @@ typedef struct _Grid_Event_Data {
19} Grid_Event_Data; 19} Grid_Event_Data;
20 20
21Eo * 21Eo *
22EoGenerate(const Efl_Class *klass, Eo *parent, Efl_Ui_Dir dir) 22EoGenerate(const Efl_Class *klass, Eo *parent, Efl_Ui_Layout_Orientation dir)
23{ 23{
24 Eo* obj = efl_add(klass, parent); 24 Eo* obj = efl_add(klass, parent);
25 if (dir != EFL_UI_DIR_DEFAULT) efl_ui_direction_set(obj, dir); 25 if (dir != EFL_UI_LAYOUT_ORIENTATION_DEFAULT) efl_ui_layout_orientation_set(obj, dir);
26 efl_gfx_hint_weight_set(obj, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); 26 efl_gfx_hint_weight_set(obj, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
27 efl_gfx_hint_fill_set(obj, EINA_TRUE, EINA_TRUE); 27 efl_gfx_hint_fill_set(obj, EINA_TRUE, EINA_TRUE);
28 return obj; 28 return obj;
@@ -43,7 +43,7 @@ elm_main(int argc, char **argv)
43 efl_text_set(efl_added, "Efl.Ui.Grid"), 43 efl_text_set(efl_added, "Efl.Ui.Grid"),
44 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 44 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
45 45
46 box = EoGenerate(EFL_UI_BOX_CLASS, win, EFL_UI_DIR_VERTICAL); 46 box = EoGenerate(EFL_UI_BOX_CLASS, win, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
47 elm_win_resize_object_add(win, box); 47 elm_win_resize_object_add(win, box);
48 48
49 Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, box); 49 Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, box);
@@ -54,7 +54,7 @@ elm_main(int argc, char **argv)
54 54
55 Eina_Bool horiz = 0; 55 Eina_Bool horiz = 0;
56 // TEST#1 : Create Grid 56 // TEST#1 : Create Grid
57 gd->grid = grid = EoGenerate(EFL_UI_GRID_CLASS, box, (horiz ? EFL_UI_DIR_HORIZONTAL : EFL_UI_DIR_VERTICAL)); 57 gd->grid = grid = EoGenerate(EFL_UI_GRID_CLASS, box, (horiz ? EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL : EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
58 efl_ui_grid_item_size_set(grid, EINA_SIZE2D(100, 120)); // 4X4 58 efl_ui_grid_item_size_set(grid, EINA_SIZE2D(100, 120)); // 4X4
59 efl_gfx_arrangement_content_padding_set(grid, 5.0, 5.0, EINA_TRUE); 59 efl_gfx_arrangement_content_padding_set(grid, 5.0, 5.0, EINA_TRUE);
60 efl_gfx_arrangement_content_align_set(grid, 0.5, 0.5); 60 efl_gfx_arrangement_content_align_set(grid, 0.5, 0.5);
diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c
index 29475f98bf..2f4e9c9ee7 100644
--- a/src/examples/elementary/efl_ui_list_example_1.c
+++ b/src/examples/elementary/efl_ui_list_example_1.c
@@ -114,7 +114,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
114 efl_gfx_entity_size_set(win, EINA_SIZE2D(400, 800)); 114 efl_gfx_entity_size_set(win, EINA_SIZE2D(400, 800));
115 115
116 wbox = efl_add(EFL_UI_BOX_CLASS, win); 116 wbox = efl_add(EFL_UI_BOX_CLASS, win);
117 efl_ui_direction_set(wbox, EFL_UI_DIR_VERTICAL); 117 efl_ui_layout_orientation_set(wbox, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
118 efl_gfx_hint_weight_set(wbox, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); 118 efl_gfx_hint_weight_set(wbox, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
119 efl_gfx_hint_fill_set(wbox, EINA_TRUE, EINA_TRUE); 119 efl_gfx_hint_fill_set(wbox, EINA_TRUE, EINA_TRUE);
120 120
@@ -142,7 +142,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
142 if (emptystyle) 142 if (emptystyle)
143 { 143 {
144 ibox = efl_add(EFL_UI_BOX_CLASS, item); 144 ibox = efl_add(EFL_UI_BOX_CLASS, item);
145 efl_ui_direction_set(ibox, EFL_UI_DIR_HORIZONTAL); 145 efl_ui_layout_orientation_set(ibox, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
146 146
147 txt = efl_add(EFL_UI_TEXT_CLASS, ibox); 147 txt = efl_add(EFL_UI_TEXT_CLASS, ibox);
148 efl_gfx_hint_weight_set(txt, 0.95, EFL_GFX_HINT_EXPAND); 148 efl_gfx_hint_weight_set(txt, 0.95, EFL_GFX_HINT_EXPAND);
@@ -230,7 +230,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
230 efl_pack_end(wbox, txt); 230 efl_pack_end(wbox, txt);
231 231
232 bbox = efl_add(EFL_UI_BOX_CLASS, wbox); 232 bbox = efl_add(EFL_UI_BOX_CLASS, wbox);
233 efl_ui_direction_set(bbox, EFL_UI_DIR_HORIZONTAL); 233 efl_ui_layout_orientation_set(bbox, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
234 efl_gfx_hint_weight_set(bbox, EFL_GFX_HINT_EXPAND, 0.05); 234 efl_gfx_hint_weight_set(bbox, EFL_GFX_HINT_EXPAND, 0.05);
235 235
236 select_radio = radio = efl_add(EFL_UI_RADIO_CLASS, wbox); 236 select_radio = radio = efl_add(EFL_UI_RADIO_CLASS, wbox);
@@ -267,7 +267,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
267 efl_pack_end(wbox, txt); 267 efl_pack_end(wbox, txt);
268 268
269 priv_d.slider = slider = efl_add(EFL_UI_SLIDER_CLASS, wbox); 269 priv_d.slider = slider = efl_add(EFL_UI_SLIDER_CLASS, wbox);
270 efl_ui_direction_set(slider, EFL_UI_DIR_HORIZONTAL); 270 efl_ui_layout_orientation_set(slider, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
271 efl_gfx_hint_weight_set(slider, 0.0, 0.05); 271 efl_gfx_hint_weight_set(slider, 0.0, 0.05);
272 efl_gfx_hint_align_set(slider, 0.5, 0.5); 272 efl_gfx_hint_align_set(slider, 0.5, 0.5);
273 efl_gfx_hint_size_min_set(slider, EINA_SIZE2D(380, 20)); 273 efl_gfx_hint_size_min_set(slider, EINA_SIZE2D(380, 20));
@@ -275,11 +275,11 @@ elm_main(int argc EINA_UNUSED, char **argv)
275 efl_pack_end(wbox, slider); 275 efl_pack_end(wbox, slider);
276 276
277 bbox = efl_add(EFL_UI_BOX_CLASS, wbox); 277 bbox = efl_add(EFL_UI_BOX_CLASS, wbox);
278 efl_ui_direction_set(bbox, EFL_UI_DIR_HORIZONTAL); 278 efl_ui_layout_orientation_set(bbox, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
279 efl_gfx_hint_weight_set(bbox, EFL_GFX_HINT_EXPAND, 0.05); 279 efl_gfx_hint_weight_set(bbox, EFL_GFX_HINT_EXPAND, 0.05);
280 280
281 rbox = efl_add(EFL_UI_BOX_CLASS, bbox); 281 rbox = efl_add(EFL_UI_BOX_CLASS, bbox);
282 efl_ui_direction_set(rbox, EFL_UI_DIR_VERTICAL); 282 efl_ui_layout_orientation_set(rbox, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
283 283
284 anim_radio = radio = efl_add(EFL_UI_RADIO_CLASS, rbox); 284 anim_radio = radio = efl_add(EFL_UI_RADIO_CLASS, rbox);
285 efl_gfx_hint_align_set(radio, 0.5, 0.5); 285 efl_gfx_hint_align_set(radio, 0.5, 0.5);
@@ -297,7 +297,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
297 efl_pack_end(bbox, rbox); 297 efl_pack_end(bbox, rbox);
298 298
299 rbox = efl_add(EFL_UI_BOX_CLASS, bbox); 299 rbox = efl_add(EFL_UI_BOX_CLASS, bbox);
300 efl_ui_direction_set(rbox, EFL_UI_DIR_VERTICAL); 300 efl_ui_layout_orientation_set(rbox, EFL_UI_LAYOUT_ORIENTATION_VERTICAL);
301 301
302 scrl_btn = efl_add(EFL_UI_BUTTON_CLASS, rbox); 302 scrl_btn = efl_add(EFL_UI_BUTTON_CLASS, rbox);
303 efl_text_set(scrl_btn, "Scroll Item"); 303 efl_text_set(scrl_btn, "Scroll Item");
diff --git a/src/examples/elementary/radio_cxx_example_01.cc b/src/examples/elementary/radio_cxx_example_01.cc
index 6d6f943fb9..4a6e58330b 100644
--- a/src/examples/elementary/radio_cxx_example_01.cc
+++ b/src/examples/elementary/radio_cxx_example_01.cc
@@ -17,7 +17,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
17 win.autohide_set(true); 17 win.autohide_set(true);
18 18
19 efl::ui::Box bx(instantiate, win); 19 efl::ui::Box bx(instantiate, win);
20 bx.direction_set(EFL_UI_DIR_HORIZONTAL); 20 bx.orientation_set(EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
21 win.content_set(bx); 21 win.content_set(bx);
22 22
23 efl::ui::Radio radio(instantiate, win); 23 efl::ui::Radio radio(instantiate, win);
diff --git a/src/examples/elementary/slider_cxx_example.cc b/src/examples/elementary/slider_cxx_example.cc
index 24de288d06..38e4b91700 100644
--- a/src/examples/elementary/slider_cxx_example.cc
+++ b/src/examples/elementary/slider_cxx_example.cc
@@ -50,13 +50,13 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
50 efl::ui::Slider sl5(instantiate, win); 50 efl::ui::Slider sl5(instantiate, win);
51 sl5.range_min_max_set(0, 100); 51 sl5.range_min_max_set(0, 100);
52 sl5.range_step_set(1); 52 sl5.range_step_set(1);
53 sl5.direction_set(EFL_UI_DIR_UP); 53 sl5.orientation_set((Efl_Ui_Layout_Orientation)(EFL_UI_LAYOUT_ORIENTATION_VERTICAL | EFL_UI_LAYOUT_ORIENTATION_INVERTED));
54 sl5.hint_fill_set(true, false); 54 sl5.hint_fill_set(true, false);
55 sl5.hint_size_min_set({0, 120}); 55 sl5.hint_size_min_set({0, 120});
56 bx.pack_end(sl5); 56 bx.pack_end(sl5);
57 57
58 efl::ui::Slider sl6(instantiate, win); 58 efl::ui::Slider sl6(instantiate, win);
59 sl6.direction_set(EFL_UI_DIR_HORIZONTAL); 59 sl6.orientation_set(EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
60 sl6.range_min_max_set(0, 10); 60 sl6.range_min_max_set(0, 10);
61 sl6.hint_fill_set(false, true); 61 sl6.hint_fill_set(false, true);
62 sl6.hint_weight_set(0, EFL_GFX_HINT_EXPAND); 62 sl6.hint_weight_set(0, EFL_GFX_HINT_EXPAND);
diff --git a/src/lib/edje/edje_part_box.c b/src/lib/edje/edje_part_box.c
index 88a667dd56..aed74614b1 100644
--- a/src/lib/edje/edje_part_box.c
+++ b/src/lib/edje/edje_part_box.c
@@ -139,23 +139,23 @@ _efl_canvas_layout_part_box_efl_container_content_count(Eo *obj, void *_pd EINA_
139 return evas_obj_box_count(pd->rp->object); 139 return evas_obj_box_count(pd->rp->object);
140} 140}
141 141
142EOLIAN static Efl_Ui_Dir 142EOLIAN static Efl_Ui_Layout_Orientation
143_efl_canvas_layout_part_box_efl_ui_direction_direction_get(const Eo *obj, void *_pd EINA_UNUSED) 143_efl_canvas_layout_part_box_efl_ui_layout_orientable_orientation_get(const Eo *obj, void *_pd EINA_UNUSED)
144{ 144{
145 PROXY_DATA_GET(obj, pd); 145 PROXY_DATA_GET(obj, pd);
146 const Edje_Part_Description_Box *desc = 146 const Edje_Part_Description_Box *desc =
147 (Edje_Part_Description_Box *) pd->rp->chosen_description; 147 (Edje_Part_Description_Box *) pd->rp->chosen_description;
148 148
149 if (!desc || !desc->box.layout) 149 if (!desc || !desc->box.layout)
150 return EFL_UI_DIR_DEFAULT; 150 return EFL_UI_LAYOUT_ORIENTATION_DEFAULT;
151 151
152 if (!strncmp(desc->box.layout, "vertical", 8)) 152 if (!strncmp(desc->box.layout, "vertical", 8))
153 return EFL_UI_DIR_VERTICAL; 153 return EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
154 else if (!strncmp(desc->box.layout, "horizontal", 10)) 154 else if (!strncmp(desc->box.layout, "horizontal", 10))
155 return EFL_UI_DIR_HORIZONTAL; 155 return EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
156 156
157 WRN("unknown orientation '%s'", desc->box.layout); 157 WRN("unknown orientation '%s'", desc->box.layout);
158 return EFL_UI_DIR_DEFAULT; 158 return EFL_UI_LAYOUT_ORIENTATION_DEFAULT;
159} 159}
160 160
161#include "efl_canvas_layout_part_box.eo.c" 161#include "efl_canvas_layout_part_box.eo.c"
diff --git a/src/lib/edje/edje_part_invalid.c b/src/lib/edje/edje_part_invalid.c
index d36491d674..a4f301a464 100644
--- a/src/lib/edje/edje_part_invalid.c
+++ b/src/lib/edje/edje_part_invalid.c
@@ -86,7 +86,7 @@ EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_at, _efl_canvas_layout_part_invalid_efl
86EDJE_PART_INVALID(Efl_Gfx_Entity *, 0, efl_pack_content_get, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_content_get, int index) 86EDJE_PART_INVALID(Efl_Gfx_Entity *, 0, efl_pack_content_get, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_content_get, int index)
87EDJE_PART_INVALID(Efl_Gfx_Entity *, 0, efl_pack_unpack_at, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_unpack_at, int index) 87EDJE_PART_INVALID(Efl_Gfx_Entity *, 0, efl_pack_unpack_at, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_unpack_at, int index)
88EDJE_PART_INVALID(int, 0, efl_pack_index_get, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_index_get, const Efl_Gfx_Entity *subobj) 88EDJE_PART_INVALID(int, 0, efl_pack_index_get, _efl_canvas_layout_part_invalid_efl_pack_linear_pack_index_get, const Efl_Gfx_Entity *subobj)
89EDJE_PART_INVALID_CONST(Efl_Ui_Dir, 0, efl_ui_direction_get, _efl_canvas_layout_part_invalid_efl_ui_direction_direction_get) 89EDJE_PART_INVALID_CONST(Efl_Ui_Layout_Orientation, 0, efl_ui_layout_orientation_get, _efl_canvas_layout_part_invalid_efl_ui_layout_orientable_orientation_get)
90EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_table, _efl_canvas_layout_part_invalid_efl_pack_table_pack_table, Efl_Gfx_Entity *subobj, int col, int row, int colspan, int rowspan) 90EDJE_PART_INVALID(Eina_Bool, 0, efl_pack_table, _efl_canvas_layout_part_invalid_efl_pack_table_pack_table, Efl_Gfx_Entity *subobj, int col, int row, int colspan, int rowspan)
91EDJE_PART_INVALID(Efl_Gfx_Entity *, 0, efl_pack_table_content_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_content_get, int col, int row) 91EDJE_PART_INVALID(Efl_Gfx_Entity *, 0, efl_pack_table_content_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_content_get, int col, int row)
92EDJE_PART_INVALID(Eina_Iterator *, 0, efl_pack_table_contents_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_contents_get, int col, int row, Eina_Bool below) 92EDJE_PART_INVALID(Eina_Iterator *, 0, efl_pack_table_contents_get, _efl_canvas_layout_part_invalid_efl_pack_table_table_contents_get, int col, int row, Eina_Bool below)
diff --git a/src/lib/edje/efl_canvas_layout_part_box.eo b/src/lib/edje/efl_canvas_layout_part_box.eo
index 38c568c8db..481e424af2 100644
--- a/src/lib/edje/efl_canvas_layout_part_box.eo
+++ b/src/lib/edje/efl_canvas_layout_part_box.eo
@@ -1,5 +1,5 @@
1class @beta Efl.Canvas.Layout_Part_Box extends Efl.Canvas.Layout_Part implements Efl.Pack_Linear, 1class @beta Efl.Canvas.Layout_Part_Box extends Efl.Canvas.Layout_Part implements Efl.Pack_Linear,
2 Efl.Ui.Direction_Readonly 2 Efl.Ui.Layout_Orientable_Readonly
3{ 3{
4 [[Represents a Box created as part of a layout. 4 [[Represents a Box created as part of a layout.
5 5
@@ -22,6 +22,6 @@ class @beta Efl.Canvas.Layout_Part_Box extends Efl.Canvas.Layout_Part implements
22 Efl.Pack_Linear.pack_content_get; 22 Efl.Pack_Linear.pack_content_get;
23 Efl.Pack_Linear.pack_unpack_at; 23 Efl.Pack_Linear.pack_unpack_at;
24 Efl.Pack_Linear.pack_index_get; 24 Efl.Pack_Linear.pack_index_get;
25 Efl.Ui.Direction.direction { get; [[Returns $default if unknown.]] } 25 Efl.Ui.Layout_Orientable.orientation { get; [[Returns $default if unknown.]] }
26 } 26 }
27} 27}
diff --git a/src/lib/edje/efl_canvas_layout_part_invalid.eo b/src/lib/edje/efl_canvas_layout_part_invalid.eo
index 54720569d2..48a4b7a589 100644
--- a/src/lib/edje/efl_canvas_layout_part_invalid.eo
+++ b/src/lib/edje/efl_canvas_layout_part_invalid.eo
@@ -1,5 +1,5 @@
1class @beta Efl.Canvas.Layout_Part_Invalid extends Efl.Canvas.Layout_Part implements Efl.Content, 1class @beta Efl.Canvas.Layout_Part_Invalid extends Efl.Canvas.Layout_Part implements Efl.Content,
2 Efl.Pack_Linear, Efl.Ui.Direction_Readonly, 2 Efl.Pack_Linear, Efl.Ui.Layout_Orientable_Readonly,
3 Efl.Pack_Table, Efl.Text, 3 Efl.Pack_Table, Efl.Text,
4 Efl.Text_Markup, Efl.Text_Markup_Interactive 4 Efl.Text_Markup, Efl.Text_Markup_Interactive
5{ 5{
@@ -58,7 +58,7 @@ class @beta Efl.Canvas.Layout_Part_Invalid extends Efl.Canvas.Layout_Part implem
58 Efl.Pack_Linear.pack_content_get; 58 Efl.Pack_Linear.pack_content_get;
59 Efl.Pack_Linear.pack_unpack_at; 59 Efl.Pack_Linear.pack_unpack_at;
60 Efl.Pack_Linear.pack_index_get; 60 Efl.Pack_Linear.pack_index_get;
61 Efl.Ui.Direction.direction { get; [[Returns $default if unknown.]] } 61 Efl.Ui.Layout_Orientable.orientation { get; [[Returns $default if unknown.]] }
62 // Efl.Canvas.Layout_Part_Table 62 // Efl.Canvas.Layout_Part_Table
63 Efl.Pack_Table.pack_table; 63 Efl.Pack_Table.pack_table;
64 Efl.Pack_Table.table_content_get; 64 Efl.Pack_Table.table_content_get;
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 2b5f62a04d..aa88196720 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -97,8 +97,8 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
97#include "interfaces/efl_text.eo.h" 97#include "interfaces/efl_text.eo.h"
98#include "interfaces/efl_text_types.eot.h" 98#include "interfaces/efl_text_types.eot.h"
99#include "interfaces/efl_ui_i18n.eo.h" 99#include "interfaces/efl_ui_i18n.eo.h"
100#include "interfaces/efl_ui_direction.eo.h" 100#include "interfaces/efl_ui_layout_orientable.eo.h"
101#include "interfaces/efl_ui_direction_readonly.eo.h" 101#include "interfaces/efl_ui_layout_orientable_readonly.eo.h"
102#include "interfaces/efl_ui_drag.eo.h" 102#include "interfaces/efl_ui_drag.eo.h"
103#include "interfaces/efl_ui_range_display.eo.h" 103#include "interfaces/efl_ui_range_display.eo.h"
104#include "interfaces/efl_ui_range_interactive.eo.h" 104#include "interfaces/efl_ui_range_interactive.eo.h"
diff --git a/src/lib/efl/interfaces/efl_gfx_image_orientable.eo b/src/lib/efl/interfaces/efl_gfx_image_orientable.eo
index 7530b8568c..2070feb737 100644
--- a/src/lib/efl/interfaces/efl_gfx_image_orientable.eo
+++ b/src/lib/efl/interfaces/efl_gfx_image_orientable.eo
@@ -1,4 +1,4 @@
1parse efl_ui_direction; 1parse efl_ui_layout_orientable;
2 2
3enum @beta Efl.Gfx.Image_Orientation 3enum @beta Efl.Gfx.Image_Orientation
4{ 4{
@@ -10,7 +10,7 @@ enum @beta Efl.Gfx.Image_Orientation
10 its roof pointing to the right if the $right orientation is used). 10 its roof pointing to the right if the $right orientation is used).
11 Flipping values ($flip_horizontal and $flip_vertical) can be additionaly added 11 Flipping values ($flip_horizontal and $flip_vertical) can be additionaly added
12 to produce a mirroring in each axis. 12 to produce a mirroring in each axis.
13 Not to be confused with @Efl.Ui.Dir which is meant for widgets, rather 13 Not to be confused with @Efl.Ui.Layout_Orientation which is meant for widgets, rather
14 than images and canvases. This enum is used to rotate images, videos and 14 than images and canvases. This enum is used to rotate images, videos and
15 the like. 15 the like.
16 ]] 16 ]]
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index 57113a52af..0817211ffb 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -61,7 +61,7 @@
61#include "interfaces/efl_model.eo.c" 61#include "interfaces/efl_model.eo.c"
62#include "interfaces/efl_interpolator.eo.c" 62#include "interfaces/efl_interpolator.eo.c"
63#include "interfaces/efl_ui_i18n.eo.c" 63#include "interfaces/efl_ui_i18n.eo.c"
64#include "interfaces/efl_ui_direction.eo.c" 64#include "interfaces/efl_ui_layout_orientable.eo.c"
65#include "interfaces/efl_ui_drag.eo.c" 65#include "interfaces/efl_ui_drag.eo.c"
66#include "interfaces/efl_ui_range_display.eo.c" 66#include "interfaces/efl_ui_range_display.eo.c"
67#include "interfaces/efl_ui_range_interactive.eo.c" 67#include "interfaces/efl_ui_range_interactive.eo.c"
diff --git a/src/lib/efl/interfaces/efl_ui_direction.eo b/src/lib/efl/interfaces/efl_ui_direction.eo
deleted file mode 100644
index ff6e831269..0000000000
--- a/src/lib/efl/interfaces/efl_ui_direction.eo
+++ /dev/null
@@ -1,48 +0,0 @@
1// FIXME: Documentation lacks proper references due to cyclic imports.
2// FIXME: What about AnyRTL? And other strange directions?
3
4parse efl_gfx_image_orientable;
5
6enum @beta Efl.Ui.Dir
7{
8 [[Direction for UI objects and layouts.
9
10 Not to be confused with @Efl.Gfx.Image_Orientation which is for images and canvases. This
11 enum is used to define how widgets should expand and orient themselves,
12 not to rotate images.
13
14 See also @Efl.Ui.Direction.
15 ]]
16 default = 0,[[Default direction. Each widget may have a different default.]]
17 horizontal, [[Horizontal direction, along the X axis. Usually left-to-right,
18 but may be inverted to right-to-left if mirroring is on.]]
19 vertical, [[Vertical direction, along the Y axis. Usually downwards.]]
20 ltr, [[Horizontal, left-to-right direction.]]
21 rtl, [[Horizontal, right-to-left direction.]]
22 down, [[Vertical, top-to-bottom direction.]]
23 up, [[Vertical, bottom-to-top direction.]]
24 right = Efl.Ui.Dir.ltr, [[Right is an alias for LTR.]]
25 left = Efl.Ui.Dir.rtl, [[Left is an alias for RTL.]]
26}
27
28interface @beta Efl.Ui.Direction
29{
30 [[EFL UI object direction interface]]
31 methods {
32 @property direction {
33 [[Control the direction of a given widget.
34
35 Use this function to change how your widget is to be disposed:
36 vertically or horizontally or inverted vertically or inverted
37 horizontally.
38
39 Mirroring as defined in @Efl.Ui.I18n can invert the $horizontal
40 direction: it is $ltr by default, but becomes $rtl if the object
41 is mirrored.
42 ]]
43 values {
44 dir: Efl.Ui.Dir; [[Direction of the widget.]]
45 }
46 }
47 }
48}
diff --git a/src/lib/efl/interfaces/efl_ui_direction_readonly.c b/src/lib/efl/interfaces/efl_ui_direction_readonly.c
deleted file mode 100644
index e972ab2b02..0000000000
--- a/src/lib/efl/interfaces/efl_ui_direction_readonly.c
+++ /dev/null
@@ -1,17 +0,0 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include <Efl.h>
6
7typedef struct {
8
9} Efl_Ui_Direction_Readonly_Data;
10
11EOLIAN static void
12_efl_ui_direction_readonly_efl_ui_direction_direction_set(Eo *obj EINA_UNUSED, Efl_Ui_Direction_Readonly_Data *pd EINA_UNUSED, Efl_Ui_Dir dir EINA_UNUSED)
13{
14 EINA_LOG_ERR("This object does not allow setting of a direction");
15}
16
17#include "interfaces/efl_ui_direction_readonly.eo.c"
diff --git a/src/lib/efl/interfaces/efl_ui_direction_readonly.eo b/src/lib/efl/interfaces/efl_ui_direction_readonly.eo
deleted file mode 100644
index aaba2d45c5..0000000000
--- a/src/lib/efl/interfaces/efl_ui_direction_readonly.eo
+++ /dev/null
@@ -1,6 +0,0 @@
1mixin @beta Efl.Ui.Direction_Readonly extends Efl.Ui.Direction
2{
3 implements {
4 Efl.Ui.Direction.direction { set; [[This will always print and error that this is a readonly object]]}
5 }
6}
diff --git a/src/lib/efl/interfaces/efl_ui_layout_orientable.eo b/src/lib/efl/interfaces/efl_ui_layout_orientable.eo
new file mode 100644
index 0000000000..98142646e9
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_ui_layout_orientable.eo
@@ -0,0 +1,52 @@
1parse efl_gfx_image_orientable;
2
3enum @beta Efl.Ui.Layout_Orientation
4{
5 [[Orientation for UI objects and layouts that can have multiple configurations.
6
7 Select among $horizontal or $vertical orientations (or use $default to let the
8 object decide). Additionally, $inverted can be added to reverse the direction
9 along the selected axis.
10
11 Not to be confused with @Efl.Gfx.Image_Orientation which is for images and canvases. This
12 enum is used to define how widgets should expand and orient themselves,
13 not to rotate images.
14
15 See also @Efl.Ui.Layout_Orientable.
16 ]]
17 default = 0, [[Default direction. Each widget may have a different default.]]
18 horizontal = 1, [[Horizontal direction, along the X axis. Usually left-to-right,
19 but can be inverted.]]
20 vertical = 2, [[Vertical direction, along the Y axis. Usually downwards but
21 can be inverted.]]
22 axis_bitmask = 3, [[This bitmask can be used to isolate the axis value from the rest of bits.]]
23 inverted = 4 [[Add this value to make the object invert its default direction
24 along the selected axis.]]
25}
26
27interface @beta Efl.Ui.Layout_Orientable
28{
29 [[Interface for UI objects which can have more than one orientation.
30
31 For example, sliders, which can be horizontal or vertical, or container
32 boxes, which can arrange their elements in a horizontal or vertical fashion.
33 ]]
34 c_prefix: efl_ui_layout;
35 methods {
36 @property orientation {
37 [[Control the direction of a given widget.
38
39 Use this function to change how your widget is to be disposed:
40 vertically or horizontally or inverted vertically or inverted
41 horizontally.
42
43 Mirroring as defined in @Efl.Ui.I18n can invert the $horizontal
44 direction: it is $ltr by default, but becomes $rtl if the object
45 is mirrored.
46 ]]
47 values {
48 dir: Efl.Ui.Layout_Orientation; [[Direction of the widget.]]
49 }
50 }
51 }
52}
diff --git a/src/lib/efl/interfaces/efl_ui_layout_orientable_readonly.c b/src/lib/efl/interfaces/efl_ui_layout_orientable_readonly.c
new file mode 100644
index 0000000000..eca76dce3d
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_ui_layout_orientable_readonly.c
@@ -0,0 +1,17 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include <Efl.h>
6
7typedef struct {
8
9} Efl_Ui_Layout_Orientable_Readonly_Data;
10
11EOLIAN static void
12_efl_ui_layout_orientable_readonly_efl_ui_layout_orientable_orientation_set(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Orientable_Readonly_Data *pd EINA_UNUSED, Efl_Ui_Layout_Orientation dir EINA_UNUSED)
13{
14 EINA_LOG_ERR("This object does not allow setting an orientation");
15}
16
17#include "interfaces/efl_ui_layout_orientable_readonly.eo.c"
diff --git a/src/lib/efl/interfaces/efl_ui_layout_orientable_readonly.eo b/src/lib/efl/interfaces/efl_ui_layout_orientable_readonly.eo
new file mode 100644
index 0000000000..8131181025
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_ui_layout_orientable_readonly.eo
@@ -0,0 +1,6 @@
1mixin @beta Efl.Ui.Layout_Orientable_Readonly extends Efl.Ui.Layout_Orientable
2{
3 implements {
4 Efl.Ui.Layout_Orientable.orientation { set; [[This will always print an error saying that this is a readonly object.]] }
5 }
6}
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index 705dbcf444..e3baa55571 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -73,8 +73,8 @@ pub_eo_files = [
73 'efl_pack_table.eo', 73 'efl_pack_table.eo',
74 'efl_gfx_arrangement.eo', 74 'efl_gfx_arrangement.eo',
75 'efl_ui_i18n.eo', 75 'efl_ui_i18n.eo',
76 'efl_ui_direction.eo', 76 'efl_ui_layout_orientable.eo',
77 'efl_ui_direction_readonly.eo', 77 'efl_ui_layout_orientable_readonly.eo',
78 'efl_ui_drag.eo', 78 'efl_ui_drag.eo',
79 'efl_ui_range_display.eo', 79 'efl_ui_range_display.eo',
80 'efl_ui_range_interactive.eo', 80 'efl_ui_range_interactive.eo',
@@ -167,7 +167,7 @@ efl_src += files([
167 'efl_observer.c', 167 'efl_observer.c',
168 'efl_file.c', 168 'efl_file.c',
169 'efl_ui_format.c', 169 'efl_ui_format.c',
170 'efl_ui_direction_readonly.c', 170 'efl_ui_layout_orientable_readonly.c',
171 'efl_text_markup_util.c', 171 'efl_text_markup_util.c',
172]) 172])
173 173
diff --git a/src/lib/elementary/efl_page_indicator_icon.c b/src/lib/elementary/efl_page_indicator_icon.c
index 835be5b3be..258b494e0f 100644
--- a/src/lib/elementary/efl_page_indicator_icon.c
+++ b/src/lib/elementary/efl_page_indicator_icon.c
@@ -147,7 +147,7 @@ _efl_page_indicator_icon_efl_page_indicator_bind(Eo *obj,
147 147
148 if (spd->pager.obj) 148 if (spd->pager.obj)
149 { 149 {
150 efl_ui_direction_set(spd->idbox, EFL_UI_DIR_HORIZONTAL); 150 efl_ui_layout_orientation_set(spd->idbox, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
151 efl_gfx_arrangement_content_padding_set(spd->idbox, 15, 15, EINA_TRUE); 151 efl_gfx_arrangement_content_padding_set(spd->idbox, 15, 15, EINA_TRUE);
152 152
153 pd->v = eina_value_float_new(0.0); 153 pd->v = eina_value_float_new(0.0);
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index c905ee18a2..e9d31eb964 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -183,7 +183,7 @@ _efl_ui_box_efl_object_constructor(Eo *obj, Efl_Ui_Box_Data *pd)
183 efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED); 183 efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED);
184 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER); 184 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER);
185 185
186 pd->dir = EFL_UI_DIR_VERTICAL; 186 pd->dir = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
187 pd->align.h = 0.5; 187 pd->align.h = 0.5;
188 pd->align.v = 0.5; 188 pd->align.v = 0.5;
189 189
@@ -372,34 +372,28 @@ _efl_ui_box_efl_container_content_iterate(Eo *obj EINA_UNUSED, Efl_Ui_Box_Data *
372} 372}
373 373
374EOLIAN static void 374EOLIAN static void
375_efl_ui_box_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Box_Data *pd, Efl_Ui_Dir dir) 375_efl_ui_box_efl_ui_layout_orientable_orientation_set(Eo *obj, Efl_Ui_Box_Data *pd, Efl_Ui_Layout_Orientation dir)
376{ 376{
377 if (pd->dir == dir) return; 377 if (pd->dir == dir) return;
378 378
379 switch (dir) 379 switch (dir)
380 { 380 {
381 case EFL_UI_DIR_RTL: 381 case EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL:
382 // FIXME: Should be inverted! 382 pd->dir = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
383 case EFL_UI_DIR_HORIZONTAL:
384 case EFL_UI_DIR_LTR:
385 pd->dir = EFL_UI_DIR_HORIZONTAL;
386 break; 383 break;
387 384
388 case EFL_UI_DIR_UP: 385 case EFL_UI_LAYOUT_ORIENTATION_VERTICAL:
389 // FIXME: Should be inverted! 386 case EFL_UI_LAYOUT_ORIENTATION_DEFAULT:
390 case EFL_UI_DIR_DOWN:
391 case EFL_UI_DIR_VERTICAL:
392 case EFL_UI_DIR_DEFAULT:
393 default: 387 default:
394 pd->dir = EFL_UI_DIR_VERTICAL; 388 pd->dir = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
395 break; 389 break;
396 } 390 }
397 391
398 efl_pack_layout_request(obj); 392 efl_pack_layout_request(obj);
399} 393}
400 394
401EOLIAN static Efl_Ui_Dir 395EOLIAN static Efl_Ui_Layout_Orientation
402_efl_ui_box_efl_ui_direction_direction_get(const Eo *obj EINA_UNUSED, Efl_Ui_Box_Data *pd) 396_efl_ui_box_efl_ui_layout_orientable_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Box_Data *pd)
403{ 397{
404 return pd->dir; 398 return pd->dir;
405} 399}
diff --git a/src/lib/elementary/efl_ui_box.eo b/src/lib/elementary/efl_ui_box.eo
index fd5ea515bb..b0a42013ae 100644
--- a/src/lib/elementary/efl_ui_box.eo
+++ b/src/lib/elementary/efl_ui_box.eo
@@ -1,5 +1,5 @@
1class @beta Efl.Ui.Box extends Efl.Ui.Widget implements Efl.Pack_Linear, Efl.Pack_Layout, 1class @beta Efl.Ui.Box extends Efl.Ui.Widget implements Efl.Pack_Linear, Efl.Pack_Layout,
2 Efl.Ui.Direction, Efl.Gfx.Arrangement 2 Efl.Ui.Layout_Orientable, Efl.Gfx.Arrangement
3{ 3{
4 [[The box widget. 4 [[The box widget.
5 5
@@ -35,7 +35,7 @@ class @beta Efl.Ui.Box extends Efl.Ui.Widget implements Efl.Pack_Linear, Efl.Pac
35 Efl.Gfx.Entity.size { set; } 35 Efl.Gfx.Entity.size { set; }
36 Efl.Container.content_iterate; 36 Efl.Container.content_iterate;
37 Efl.Container.content_count; 37 Efl.Container.content_count;
38 Efl.Ui.Direction.direction { get; set; } 38 Efl.Ui.Layout_Orientable.orientation { get; set; }
39 Efl.Pack.pack_clear; 39 Efl.Pack.pack_clear;
40 Efl.Pack.unpack_all; 40 Efl.Pack.unpack_all;
41 Efl.Pack.unpack; 41 Efl.Pack.unpack;
diff --git a/src/lib/elementary/efl_ui_box_flow.c b/src/lib/elementary/efl_ui_box_flow.c
index 2600acffd9..82917f090d 100644
--- a/src/lib/elementary/efl_ui_box_flow.c
+++ b/src/lib/elementary/efl_ui_box_flow.c
@@ -70,7 +70,7 @@ _efl_ui_box_flow_efl_pack_layout_layout_update(Eo *obj, Efl_Ui_Box_Flow_Data *pd
70 Item_Calc *items, *item; 70 Item_Calc *items, *item;
71 Row_Calc *rows, *row; 71 Row_Calc *rows, *row;
72 Efl_Ui_Container_Item_Hints *hints, *hint; 72 Efl_Ui_Container_Item_Hints *hints, *hint;
73 Eina_Bool axis = !efl_ui_dir_is_horizontal(bd->dir, EINA_FALSE); 73 Eina_Bool axis = !efl_ui_layout_orientation_is_horizontal(bd->dir, EINA_FALSE);
74 Eina_Bool c_axis = !axis; 74 Eina_Bool c_axis = !axis;
75 int want[2] = { 0, 0 }; 75 int want[2] = { 0, 0 };
76 int rc = 0, count, i = 0, id, item_last = 0; 76 int rc = 0, count, i = 0, id, item_last = 0;
diff --git a/src/lib/elementary/efl_ui_box_layout.c b/src/lib/elementary/efl_ui_box_layout.c
index 7240cd012c..eede41e799 100644
--- a/src/lib/elementary/efl_ui_box_layout.c
+++ b/src/lib/elementary/efl_ui_box_layout.c
@@ -35,7 +35,7 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Efl_Ui_Box_Data *pd)
35 Eina_Inlist *inlist = NULL; 35 Eina_Inlist *inlist = NULL;
36 Item_Calc *items, *item; 36 Item_Calc *items, *item;
37 Efl_Ui_Container_Item_Hints *hints, *hint; 37 Efl_Ui_Container_Item_Hints *hints, *hint;
38 Eina_Bool axis = !efl_ui_dir_is_horizontal(pd->dir, EINA_FALSE); 38 Eina_Bool axis = !efl_ui_layout_orientation_is_horizontal(pd->dir, EINA_FALSE);
39 Eina_Bool r_axis = !axis; 39 Eina_Bool r_axis = !axis;
40 int want[2] = { 0, 0 }; 40 int want[2] = { 0, 0 };
41 int count, i = 0; 41 int count, i = 0;
diff --git a/src/lib/elementary/efl_ui_box_private.h b/src/lib/elementary/efl_ui_box_private.h
index 5921eaf783..47400df3fc 100644
--- a/src/lib/elementary/efl_ui_box_private.h
+++ b/src/lib/elementary/efl_ui_box_private.h
@@ -14,7 +14,7 @@ typedef struct _Efl_Ui_Box_Data Efl_Ui_Box_Data;
14 14
15struct _Efl_Ui_Box_Data 15struct _Efl_Ui_Box_Data
16{ 16{
17 Efl_Ui_Dir dir; 17 Efl_Ui_Layout_Orientation dir;
18 Eo *clipper; 18 Eo *clipper;
19 Eina_List *children; 19 Eina_List *children;
20 20
diff --git a/src/lib/elementary/efl_ui_datepicker.c b/src/lib/elementary/efl_ui_datepicker.c
index 06a18780e3..671822fca9 100644
--- a/src/lib/elementary/efl_ui_datepicker.c
+++ b/src/lib/elementary/efl_ui_datepicker.c
@@ -163,21 +163,21 @@ _fields_init(Eo *obj)
163 efl_ui_range_min_max_set(efl_added, 1970, 2037), 163 efl_ui_range_min_max_set(efl_added, 1970, 2037),
164 efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), 164 efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE),
165 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 165 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
166 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 166 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
167 efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj)); 167 efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj));
168 168
169 pd->month = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, 169 pd->month = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
170 efl_ui_range_min_max_set(efl_added, 1, 12), 170 efl_ui_range_min_max_set(efl_added, 1, 12),
171 efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), 171 efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE),
172 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 172 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
173 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 173 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
174 efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj)); 174 efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj));
175 175
176 pd->day = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, 176 pd->day = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
177 efl_ui_range_min_max_set(efl_added, 1, 31), 177 efl_ui_range_min_max_set(efl_added, 1, 31),
178 efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), 178 efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE),
179 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 179 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
180 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 180 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
181 efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj)); 181 efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj));
182 182
183 DATE_GET(); 183 DATE_GET();
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index 71dc20e076..f41cdeea75 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -2027,43 +2027,41 @@ _efl_ui_flip_interaction_get(const Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *sd)
2027 return sd->intmode; 2027 return sd->intmode;
2028} 2028}
2029 2029
2030static Efl_Ui_Dir 2030static Efl_Ui_Layout_Orientation
2031_flip_dir_to_efl_ui_dir(Elm_Flip_Direction dir) 2031_flip_dir_to_efl_ui_dir(Elm_Flip_Direction dir)
2032{ 2032{
2033 switch (dir) 2033 switch (dir)
2034 { 2034 {
2035 case ELM_FLIP_DIRECTION_RIGHT: return EFL_UI_DIR_RIGHT; 2035 case ELM_FLIP_DIRECTION_RIGHT: return EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
2036 case ELM_FLIP_DIRECTION_DOWN: return EFL_UI_DIR_DOWN; 2036 case ELM_FLIP_DIRECTION_DOWN: return EFL_UI_LAYOUT_ORIENTATION_VERTICAL | EFL_UI_LAYOUT_ORIENTATION_INVERTED;
2037 case ELM_FLIP_DIRECTION_LEFT: return EFL_UI_DIR_LEFT; 2037 case ELM_FLIP_DIRECTION_LEFT: return EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL | EFL_UI_LAYOUT_ORIENTATION_INVERTED;
2038 case ELM_FLIP_DIRECTION_UP: return EFL_UI_DIR_UP; 2038 case ELM_FLIP_DIRECTION_UP: return EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
2039 } 2039 }
2040 ERR("Invalid value for Elm_Flip_Direction: %d", (int) dir); 2040 ERR("Invalid value for Elm_Flip_Direction: %d", (int) dir);
2041 return EFL_UI_DIR_DEFAULT; 2041 return EFL_UI_LAYOUT_ORIENTATION_DEFAULT;
2042} 2042}
2043 2043
2044static Elm_Flip_Direction 2044static Elm_Flip_Direction
2045_efl_ui_dir_to_flip_dir(Efl_Ui_Dir dir) 2045_efl_ui_dir_to_flip_dir(Efl_Ui_Layout_Orientation dir)
2046{ 2046{
2047 switch (dir) 2047 switch (dir)
2048 { 2048 {
2049 case EFL_UI_DIR_RIGHT: 2049 case EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL:
2050 case EFL_UI_DIR_HORIZONTAL:
2051 return ELM_FLIP_DIRECTION_RIGHT; 2050 return ELM_FLIP_DIRECTION_RIGHT;
2052 case EFL_UI_DIR_DOWN: 2051 case EFL_UI_LAYOUT_ORIENTATION_VERTICAL | EFL_UI_LAYOUT_ORIENTATION_INVERTED:
2053 return ELM_FLIP_DIRECTION_DOWN; 2052 return ELM_FLIP_DIRECTION_DOWN;
2054 case EFL_UI_DIR_LEFT: 2053 case EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL | EFL_UI_LAYOUT_ORIENTATION_INVERTED:
2055 return ELM_FLIP_DIRECTION_LEFT; 2054 return ELM_FLIP_DIRECTION_LEFT;
2056 case EFL_UI_DIR_UP: 2055 case EFL_UI_LAYOUT_ORIENTATION_VERTICAL:
2057 case EFL_UI_DIR_VERTICAL: 2056 case EFL_UI_LAYOUT_ORIENTATION_DEFAULT:
2058 case EFL_UI_DIR_DEFAULT:
2059 return ELM_FLIP_DIRECTION_UP; 2057 return ELM_FLIP_DIRECTION_UP;
2060 } 2058 }
2061 ERR("Invalid value for Efl_Ui_Dir: %d", (int) dir); 2059 ERR("Invalid value for Efl_Ui_Layout_Orientation: %d", (int) dir);
2062 return ELM_FLIP_DIRECTION_UP; 2060 return ELM_FLIP_DIRECTION_UP;
2063} 2061}
2064 2062
2065EOLIAN static void 2063EOLIAN static void
2066_efl_ui_flip_interaction_direction_enabled_set(Eo *obj, Efl_Ui_Flip_Data *sd, Efl_Ui_Dir dir, Eina_Bool enabled) 2064_efl_ui_flip_interaction_direction_enabled_set(Eo *obj, Efl_Ui_Flip_Data *sd, Efl_Ui_Layout_Orientation dir, Eina_Bool enabled)
2067{ 2065{
2068 int i = _efl_ui_dir_to_flip_dir(dir); 2066 int i = _efl_ui_dir_to_flip_dir(dir);
2069 int area; 2067 int area;
@@ -2085,13 +2083,13 @@ _efl_ui_flip_interaction_direction_enabled_set(Eo *obj, Efl_Ui_Flip_Data *sd, Ef
2085} 2083}
2086 2084
2087EOLIAN static Eina_Bool 2085EOLIAN static Eina_Bool
2088_efl_ui_flip_interaction_direction_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *sd, Efl_Ui_Dir dir) 2086_efl_ui_flip_interaction_direction_enabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *sd, Efl_Ui_Layout_Orientation dir)
2089{ 2087{
2090 return sd->dir_enabled[_efl_ui_dir_to_flip_dir(dir)]; 2088 return sd->dir_enabled[_efl_ui_dir_to_flip_dir(dir)];
2091} 2089}
2092 2090
2093EOLIAN static void 2091EOLIAN static void
2094_efl_ui_flip_interaction_direction_hitsize_set(Eo *obj, Efl_Ui_Flip_Data *sd, Efl_Ui_Dir dir, double hitsize) 2092_efl_ui_flip_interaction_direction_hitsize_set(Eo *obj, Efl_Ui_Flip_Data *sd, Efl_Ui_Layout_Orientation dir, double hitsize)
2095{ 2093{
2096 int i = _efl_ui_dir_to_flip_dir(dir); 2094 int i = _efl_ui_dir_to_flip_dir(dir);
2097 2095
@@ -2189,7 +2187,7 @@ _content_removed(Eo *obj, Efl_Ui_Flip_Data *pd, Efl_Gfx_Entity *content)
2189} 2187}
2190 2188
2191EOLIAN static double 2189EOLIAN static double
2192_efl_ui_flip_interaction_direction_hitsize_get(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *sd, Efl_Ui_Dir dir) 2190_efl_ui_flip_interaction_direction_hitsize_get(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Data *sd, Efl_Ui_Layout_Orientation dir)
2193{ 2191{
2194 int i = _efl_ui_dir_to_flip_dir(dir); 2192 int i = _efl_ui_dir_to_flip_dir(dir);
2195 2193
@@ -2299,28 +2297,28 @@ _efl_ui_flip_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Efl_Ui_Flip_Dat
2299EAPI void 2297EAPI void
2300elm_flip_interaction_direction_hitsize_set(Efl_Ui_Flip *obj, Elm_Flip_Direction dir, double hitsize) 2298elm_flip_interaction_direction_hitsize_set(Efl_Ui_Flip *obj, Elm_Flip_Direction dir, double hitsize)
2301{ 2299{
2302 Efl_Ui_Dir uidir = _flip_dir_to_efl_ui_dir(dir); 2300 Efl_Ui_Layout_Orientation uidir = _flip_dir_to_efl_ui_dir(dir);
2303 efl_ui_flip_interaction_direction_hitsize_set(obj, uidir, hitsize); 2301 efl_ui_flip_interaction_direction_hitsize_set(obj, uidir, hitsize);
2304} 2302}
2305 2303
2306EAPI double 2304EAPI double
2307elm_flip_interaction_direction_hitsize_get(Efl_Ui_Flip *obj, Elm_Flip_Direction dir) 2305elm_flip_interaction_direction_hitsize_get(Efl_Ui_Flip *obj, Elm_Flip_Direction dir)
2308{ 2306{
2309 Efl_Ui_Dir uidir = _flip_dir_to_efl_ui_dir(dir); 2307 Efl_Ui_Layout_Orientation uidir = _flip_dir_to_efl_ui_dir(dir);
2310 return efl_ui_flip_interaction_direction_hitsize_get(obj, uidir); 2308 return efl_ui_flip_interaction_direction_hitsize_get(obj, uidir);
2311} 2309}
2312 2310
2313EOAPI void 2311EOAPI void
2314elm_flip_interaction_direction_enabled_set(Efl_Ui_Flip *obj, Elm_Flip_Direction dir, Eina_Bool enabled) 2312elm_flip_interaction_direction_enabled_set(Efl_Ui_Flip *obj, Elm_Flip_Direction dir, Eina_Bool enabled)
2315{ 2313{
2316 Efl_Ui_Dir uidir = _flip_dir_to_efl_ui_dir(dir); 2314 Efl_Ui_Layout_Orientation uidir = _flip_dir_to_efl_ui_dir(dir);
2317 efl_ui_flip_interaction_direction_enabled_set(obj, uidir, enabled); 2315 efl_ui_flip_interaction_direction_enabled_set(obj, uidir, enabled);
2318} 2316}
2319 2317
2320EOAPI Eina_Bool 2318EOAPI Eina_Bool
2321elm_flip_interaction_direction_enabled_get(Efl_Ui_Flip *obj, Elm_Flip_Direction dir) 2319elm_flip_interaction_direction_enabled_get(Efl_Ui_Flip *obj, Elm_Flip_Direction dir)
2322{ 2320{
2323 Efl_Ui_Dir uidir = _flip_dir_to_efl_ui_dir(dir); 2321 Efl_Ui_Layout_Orientation uidir = _flip_dir_to_efl_ui_dir(dir);
2324 return efl_ui_flip_interaction_direction_enabled_get(obj, uidir); 2322 return efl_ui_flip_interaction_direction_enabled_get(obj, uidir);
2325} 2323}
2326 2324
diff --git a/src/lib/elementary/efl_ui_flip.eo b/src/lib/elementary/efl_ui_flip.eo
index fb5a931067..e95d77e889 100644
--- a/src/lib/elementary/efl_ui_flip.eo
+++ b/src/lib/elementary/efl_ui_flip.eo
@@ -1,4 +1,4 @@
1import efl_ui_direction; 1import efl_ui_layout_orientable;
2 2
3enum @beta Efl.Ui.Flip_Mode 3enum @beta Efl.Ui.Flip_Mode
4{ 4{
@@ -86,7 +86,7 @@ class @beta Efl.Ui.Flip extends Efl.Ui.Widget implements Efl.Pack_Linear
86 See also @.interaction.set. 86 See also @.interaction.set.
87 ]] 87 ]]
88 params { 88 params {
89 @in dir: Efl.Ui.Dir; [[The hit area to set.]] 89 @in dir: Efl.Ui.Layout_Orientation; [[The hit area to set.]]
90 @in hitsize: double; [[The amount of that dimension (0.0 to 1.0) to use.]] 90 @in hitsize: double; [[The amount of that dimension (0.0 to 1.0) to use.]]
91 } 91 }
92 } 92 }
@@ -94,7 +94,7 @@ class @beta Efl.Ui.Flip extends Efl.Ui.Widget implements Efl.Pack_Linear
94 [[Get the amount of the flip that is sensitive to interactive flip.]] 94 [[Get the amount of the flip that is sensitive to interactive flip.]]
95 return: double; [[The size set for that direction.]] 95 return: double; [[The size set for that direction.]]
96 params { 96 params {
97 @in dir: Efl.Ui.Dir; [[The direction to check.]] 97 @in dir: Efl.Ui.Layout_Orientation; [[The direction to check.]]
98 } 98 }
99 } 99 }
100 interaction_direction_enabled_set { 100 interaction_direction_enabled_set {
@@ -110,7 +110,7 @@ class @beta Efl.Ui.Flip extends Efl.Ui.Widget implements Efl.Pack_Linear
110 hit area will be created on the opposite edge of the flip. 110 hit area will be created on the opposite edge of the flip.
111 ]] 111 ]]
112 params { 112 params {
113 @in dir: Efl.Ui.Dir; [[The direction to change.]] 113 @in dir: Efl.Ui.Layout_Orientation; [[The direction to change.]]
114 @in enabled: bool; [[If that direction is enabled or not.]] 114 @in enabled: bool; [[If that direction is enabled or not.]]
115 } 115 }
116 } 116 }
@@ -118,7 +118,7 @@ class @beta Efl.Ui.Flip extends Efl.Ui.Widget implements Efl.Pack_Linear
118 [[Get the enabled state of that flip direction.]] 118 [[Get the enabled state of that flip direction.]]
119 return: bool; [[If that direction is enabled or not.]] 119 return: bool; [[If that direction is enabled or not.]]
120 params { 120 params {
121 @in dir: Efl.Ui.Dir; [[The direction to check.]] 121 @in dir: Efl.Ui.Layout_Orientation; [[The direction to check.]]
122 } 122 }
123 } 123 }
124 go { 124 go {
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 6736249bbe..5e1f50638d 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -64,7 +64,7 @@ _relayout(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd, Eina_Position2D pan)
64 Eina_Bool horiz = 0; 64 Eina_Bool horiz = 0;
65 Eina_Size2D min, max; 65 Eina_Size2D min, max;
66 66
67 if (pd->dir == EFL_UI_DIR_HORIZONTAL) horiz = 1; 67 if (pd->dir == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL) horiz = 1;
68 68
69 if (!pd->linemax) 69 if (!pd->linemax)
70 { 70 {
@@ -218,7 +218,7 @@ _item_scroll_internal(Eo *obj,
218 view = efl_ui_scrollable_viewport_geometry_get(pd->smanager); 218 view = efl_ui_scrollable_viewport_geometry_get(pd->smanager);
219 vpos = efl_ui_scrollable_content_pos_get(pd->smanager); 219 vpos = efl_ui_scrollable_content_pos_get(pd->smanager);
220 220
221 if (pd->dir == EFL_UI_DIR_HORIZONTAL) 221 if (pd->dir == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
222 { 222 {
223 ipos.y = view.y; 223 ipos.y = view.y;
224 //ipos.h = ipos.h; 224 //ipos.h = ipos.h;
@@ -835,25 +835,18 @@ _efl_ui_grid_efl_container_content_iterate(Eo *obj, Efl_Ui_Grid_Data *pd)
835} 835}
836 836
837EOLIAN static void 837EOLIAN static void
838_efl_ui_grid_efl_ui_direction_direction_set(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd, Efl_Ui_Dir dir) 838_efl_ui_grid_efl_ui_layout_orientable_orientation_set(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd, Efl_Ui_Layout_Orientation dir)
839{ 839{
840 //FIXME: Currently only support horizontal and vertical mode. 840 //FIXME: Currently only support horizontal and vertical mode.
841 switch (dir) 841 switch (dir)
842 { 842 {
843 case EFL_UI_DIR_RTL: 843 case EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL:
844 // FIXME: Should be inverted! 844 pd->dir = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
845 case EFL_UI_DIR_HORIZONTAL:
846 case EFL_UI_DIR_LTR:
847 pd->dir = EFL_UI_DIR_HORIZONTAL;
848 break; 845 break;
849 846 case EFL_UI_LAYOUT_ORIENTATION_VERTICAL:
850 case EFL_UI_DIR_UP: 847 case EFL_UI_LAYOUT_ORIENTATION_DEFAULT:
851 // FIXME: Should be inverted!
852 case EFL_UI_DIR_DOWN:
853 case EFL_UI_DIR_VERTICAL:
854 case EFL_UI_DIR_DEFAULT:
855 default: 848 default:
856 pd->dir = EFL_UI_DIR_VERTICAL; 849 pd->dir = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
857 break; 850 break;
858 } 851 }
859 852
@@ -861,8 +854,8 @@ _efl_ui_grid_efl_ui_direction_direction_set(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Dat
861 efl_pack_layout_request(obj); 854 efl_pack_layout_request(obj);
862} 855}
863 856
864EOLIAN static Efl_Ui_Dir 857EOLIAN static Efl_Ui_Layout_Orientation
865_efl_ui_grid_efl_ui_direction_direction_get(const Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd) 858_efl_ui_grid_efl_ui_layout_orientable_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd)
866{ 859{
867 return pd->dir; 860 return pd->dir;
868} 861}
diff --git a/src/lib/elementary/efl_ui_grid.eo b/src/lib/elementary/efl_ui_grid.eo
index a07aa82031..f736f1b827 100644
--- a/src/lib/elementary/efl_ui_grid.eo
+++ b/src/lib/elementary/efl_ui_grid.eo
@@ -4,7 +4,7 @@ class @beta Efl.Ui.Grid extends Efl.Ui.Layout_Base implements
4 Efl.Ui.Scrollable_Interactive, 4 Efl.Ui.Scrollable_Interactive,
5 Efl.Ui.Scrollbar, 5 Efl.Ui.Scrollbar,
6 Efl.Pack_Linear, Efl.Pack_Layout, 6 Efl.Pack_Linear, Efl.Pack_Layout,
7 Efl.Ui.Direction, 7 Efl.Ui.Layout_Orientable,
8 Efl.Ui.Selectable, 8 Efl.Ui.Selectable,
9 Efl.Ui.Multi_Selectable, 9 Efl.Ui.Multi_Selectable,
10 Efl.Gfx.Arrangement 10 Efl.Gfx.Arrangement
@@ -60,7 +60,7 @@ class @beta Efl.Ui.Grid extends Efl.Ui.Layout_Base implements
60 Efl.Container.content_iterate; 60 Efl.Container.content_iterate;
61 Efl.Container.content_count; 61 Efl.Container.content_count;
62 62
63 Efl.Ui.Direction.direction { get; set; } 63 Efl.Ui.Layout_Orientable.orientation { get; set; }
64 64
65 //Efl.Ui.Widget 65 //Efl.Ui.Widget
66 Efl.Ui.Widget.theme_apply; 66 Efl.Ui.Widget.theme_apply;
diff --git a/src/lib/elementary/efl_ui_grid_private.h b/src/lib/elementary/efl_ui_grid_private.h
index a48d183639..c9c8e0ef1b 100644
--- a/src/lib/elementary/efl_ui_grid_private.h
+++ b/src/lib/elementary/efl_ui_grid_private.h
@@ -12,7 +12,7 @@ typedef struct _Efl_Ui_Grid_Data
12 Eo *smanager; /* Scroll Manager for support scroll with pan */ 12 Eo *smanager; /* Scroll Manager for support scroll with pan */
13 Eina_Rect geo; 13 Eina_Rect geo;
14 Eina_Position2D pre_pos; 14 Eina_Position2D pre_pos;
15 Efl_Ui_Dir dir; 15 Efl_Ui_Layout_Orientation dir;
16 16
17 struct { 17 struct {
18 Efl_Ui_Grid_Item *item; /* Scroll target item */ 18 Efl_Ui_Grid_Item *item; /* Scroll target item */
diff --git a/src/lib/elementary/efl_ui_layout_pack.c b/src/lib/elementary/efl_ui_layout_pack.c
index c59264cede..6cd89f20a5 100644
--- a/src/lib/elementary/efl_ui_layout_pack.c
+++ b/src/lib/elementary/efl_ui_layout_pack.c
@@ -203,12 +203,12 @@ _efl_ui_layout_part_box_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Efl_
203 return efl_pack_index_get(pack, subobj); 203 return efl_pack_index_get(pack, subobj);
204} 204}
205 205
206EOLIAN static Efl_Ui_Dir 206EOLIAN static Efl_Ui_Layout_Orientation
207_efl_ui_layout_part_box_efl_ui_direction_direction_get(const Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd) 207_efl_ui_layout_part_box_efl_ui_layout_orientable_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd)
208{ 208{
209 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_DIR_DEFAULT); 209 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_LAYOUT_ORIENTATION_DEFAULT);
210 210
211 return efl_ui_direction_get(efl_part(wd->resize_obj, pd->part)); 211 return efl_ui_layout_orientation_get(efl_part(wd->resize_obj, pd->part));
212} 212}
213 213
214 214
diff --git a/src/lib/elementary/efl_ui_layout_part_box.eo b/src/lib/elementary/efl_ui_layout_part_box.eo
index f83bff735d..683418c7d4 100644
--- a/src/lib/elementary/efl_ui_layout_part_box.eo
+++ b/src/lib/elementary/efl_ui_layout_part_box.eo
@@ -1,5 +1,5 @@
1class @beta Efl.Ui.Layout_Part_Box extends Efl.Object implements Efl.Pack_Linear, 1class @beta Efl.Ui.Layout_Part_Box extends Efl.Object implements Efl.Pack_Linear,
2 Efl.Ui.Direction_Readonly 2 Efl.Ui.Layout_Orientable_Readonly
3{ 3{
4 [[Represents a Box created as part of a layout. 4 [[Represents a Box created as part of a layout.
5 5
@@ -22,7 +22,7 @@ class @beta Efl.Ui.Layout_Part_Box extends Efl.Object implements Efl.Pack_Linear
22 Efl.Object.destructor; 22 Efl.Object.destructor;
23 Efl.Container.content_iterate; 23 Efl.Container.content_iterate;
24 Efl.Container.content_count; 24 Efl.Container.content_count;
25 Efl.Ui.Direction.direction { get; } 25 Efl.Ui.Layout_Orientable.orientation { get; }
26 Efl.Pack.pack_clear; 26 Efl.Pack.pack_clear;
27 Efl.Pack.unpack_all; 27 Efl.Pack.unpack_all;
28 Efl.Pack.unpack; 28 Efl.Pack.unpack;
diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c
index 27ed153001..7e10f06618 100644
--- a/src/lib/elementary/efl_ui_list.c
+++ b/src/lib/elementary/efl_ui_list.c
@@ -438,7 +438,7 @@ _efl_ui_list_efl_object_finalize(Eo *obj,
438 edje_object_part_swallow(wd->resize_obj, "efl.content", pd->pan); 438 edje_object_part_swallow(wd->resize_obj, "efl.content", pd->pan);
439 439
440 pd->box = efl_add(EFL_UI_BOX_CLASS, obj, 440 pd->box = efl_add(EFL_UI_BOX_CLASS, obj,
441 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL)); 441 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
442 efl_ui_mirrored_set(pd->box, efl_ui_mirrored_get(obj)); 442 efl_ui_mirrored_set(pd->box, efl_ui_mirrored_get(obj));
443 efl_content_set(pd->pan, pd->box); 443 efl_content_set(pd->pan, pd->box);
444 444
@@ -574,24 +574,17 @@ _efl_ui_list_efl_container_content_iterate(Eo *obj EINA_UNUSED, Efl_Ui_List_Data
574 574
575/* FIXME: Direction is not supported yet in the list 575/* FIXME: Direction is not supported yet in the list
576 EOLIAN static void 576 EOLIAN static void
577 _efl_ui_list_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_List_Data *pd, Efl_Ui_Dir dir) 577 _efl_ui_list_efl_ui_layout_orientable_orientation_set(Eo *obj, Efl_Ui_List_Data *pd, Efl_Ui_Layout_Orientation dir)
578 { 578 {
579 switch (dir) 579 switch (dir)
580 { 580 {
581 case EFL_UI_DIR_RTL: 581 case EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL:
582 // FIXME: Should be inverted! 582 pd->dir = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
583 case EFL_UI_DIR_HORIZONTAL:
584 case EFL_UI_DIR_LTR:
585 pd->dir = EFL_UI_DIR_HORIZONTAL;
586 break; 583 break;
587 584 case EFL_UI_LAYOUT_ORIENTATION_VERTICAL:
588 case EFL_UI_DIR_UP: 585 case EFL_UI_LAYOUT_ORIENTATION_DEFAULT:
589 // FIXME: Should be inverted!
590 case EFL_UI_DIR_DOWN:
591 case EFL_UI_DIR_VERTICAL:
592 case EFL_UI_DIR_DEFAULT:
593 default: 586 default:
594 pd->dir = EFL_UI_DIR_VERTICAL; 587 pd->dir = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
595 break; 588 break;
596 } 589 }
597 590
diff --git a/src/lib/elementary/efl_ui_list.eo b/src/lib/elementary/efl_ui_list.eo
index 08e6478f53..788d881ea7 100644
--- a/src/lib/elementary/efl_ui_list.eo
+++ b/src/lib/elementary/efl_ui_list.eo
@@ -51,7 +51,7 @@ class @beta Efl.Ui.List extends Efl.Ui.Layout_Base implements
51 Efl.Container.content_iterate; 51 Efl.Container.content_iterate;
52 Efl.Container.content_count; 52 Efl.Container.content_count;
53 53
54 //Efl.Ui.Direction.direction { get; set; } //TODO 54 //Efl.Ui.Layout_Orientable.orientation { get; set; } //TODO
55 55
56 //Efl.Ui.Widget 56 //Efl.Ui.Widget
57 Efl.Ui.Widget.theme_apply; 57 Efl.Ui.Widget.theme_apply;
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index fe3ed5c09b..7069e3edb5 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -103,7 +103,7 @@ _efl_ui_panes_theme_group_get(Evas_Object *obj, Efl_Ui_Panes_Data *sd)
103 } 103 }
104 } 104 }
105 105
106 if (sd->dir == EFL_UI_DIR_HORIZONTAL) 106 if (sd->dir == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
107 eina_strbuf_append(new_group, "horizontal"); 107 eina_strbuf_append(new_group, "horizontal");
108 else 108 else
109 eina_strbuf_append(new_group, "vertical"); 109 eina_strbuf_append(new_group, "vertical");
@@ -238,7 +238,7 @@ _efl_ui_panes_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Panes_Data *sd)
238 sd->second_min = efl_gfx_hint_size_min_get(second_content); 238 sd->second_min = efl_gfx_hint_size_min_get(second_content);
239 } 239 }
240 240
241 if (sd->dir == EFL_UI_DIR_HORIZONTAL) 241 if (sd->dir == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
242 { 242 {
243 min.w = MAX(sd->first_min.w, sd->second_min.w); 243 min.w = MAX(sd->first_min.w, sd->second_min.w);
244 min.h = sd->first_min.h + sd->second_min.h; 244 min.h = sd->first_min.h + sd->second_min.h;
@@ -267,7 +267,7 @@ _set_min_size_new(void *data)
267 267
268 evas_object_geometry_get(wd->resize_obj, NULL, NULL, &w, &h); 268 evas_object_geometry_get(wd->resize_obj, NULL, NULL, &w, &h);
269 269
270 if (sd->dir == EFL_UI_DIR_HORIZONTAL) 270 if (sd->dir == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
271 { 271 {
272 if (first_min.h + second_min.h > h) 272 if (first_min.h + second_min.h > h)
273 { 273 {
@@ -331,7 +331,7 @@ _set_min_size(void *data)
331 sizer = sizer / sum; 331 sizer = sizer / sum;
332 sizel = sizel / sum; 332 sizel = sizel / sum;
333 } 333 }
334 if (sd->dir == EFL_UI_DIR_HORIZONTAL) 334 if (sd->dir == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
335 { 335 {
336 edje_object_part_drag_value_set 336 edje_object_part_drag_value_set
337 (wd->resize_obj, "right_constraint", 0.0, (1 - sizer)); 337 (wd->resize_obj, "right_constraint", 0.0, (1 - sizer));
@@ -357,7 +357,7 @@ _update_fixed_sides(void *data)
357 357
358 if (sd->right_min_size_is_relative) 358 if (sd->right_min_size_is_relative)
359 { 359 {
360 if (sd->dir == EFL_UI_DIR_HORIZONTAL) 360 if (sd->dir == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
361 sd->right_min_size = (int)(h * sd->right_min_relative_size); 361 sd->right_min_size = (int)(h * sd->right_min_relative_size);
362 else 362 else
363 sd->right_min_size =(int)(w * sd->right_min_relative_size); 363 sd->right_min_size =(int)(w * sd->right_min_relative_size);
@@ -365,15 +365,15 @@ _update_fixed_sides(void *data)
365 else 365 else
366 { 366 {
367 sd->right_min_relative_size = 0; 367 sd->right_min_relative_size = 0;
368 if (sd->dir == EFL_UI_DIR_HORIZONTAL && (h > 0)) 368 if (sd->dir == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL && (h > 0))
369 sd->right_min_relative_size = sd->right_min_size / (double)h; 369 sd->right_min_relative_size = sd->right_min_size / (double)h;
370 if (sd->dir == EFL_UI_DIR_VERTICAL && (w > 0)) 370 if (sd->dir == EFL_UI_LAYOUT_ORIENTATION_VERTICAL && (w > 0))
371 sd->right_min_relative_size = sd->right_min_size / (double)w; 371 sd->right_min_relative_size = sd->right_min_size / (double)w;
372 } 372 }
373 373
374 if(sd->left_min_size_is_relative) 374 if(sd->left_min_size_is_relative)
375 { 375 {
376 if (sd->dir == EFL_UI_DIR_HORIZONTAL) 376 if (sd->dir == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
377 sd->left_min_size = (int)(h * sd->left_min_relative_size); 377 sd->left_min_size = (int)(h * sd->left_min_relative_size);
378 else 378 else
379 sd->left_min_size = (int)(w * sd->left_min_relative_size); 379 sd->left_min_size = (int)(w * sd->left_min_relative_size);
@@ -381,9 +381,9 @@ _update_fixed_sides(void *data)
381 else 381 else
382 { 382 {
383 sd->left_min_relative_size = 0; 383 sd->left_min_relative_size = 0;
384 if (sd->dir == EFL_UI_DIR_HORIZONTAL && (h > 0)) 384 if (sd->dir == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL && (h > 0))
385 sd->left_min_relative_size = sd->left_min_size / (double)h; 385 sd->left_min_relative_size = sd->left_min_size / (double)h;
386 if (sd->dir == EFL_UI_DIR_VERTICAL && (w > 0)) 386 if (sd->dir == EFL_UI_LAYOUT_ORIENTATION_VERTICAL && (w > 0))
387 sd->left_min_relative_size = sd->left_min_size / (double)w; 387 sd->left_min_relative_size = sd->left_min_size / (double)w;
388 } 388 }
389 389
@@ -445,7 +445,7 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
445 (wd->resize_obj, EVAS_CALLBACK_RESIZE, 445 (wd->resize_obj, EVAS_CALLBACK_RESIZE,
446 _on_resize, obj); 446 _on_resize, obj);
447 447
448 sd->dir = EFL_UI_DIR_VERTICAL; 448 sd->dir = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
449 sd->right_min_size_is_relative = EINA_TRUE; 449 sd->right_min_size_is_relative = EINA_TRUE;
450 sd->left_min_size_is_relative = EINA_TRUE; 450 sd->left_min_size_is_relative = EINA_TRUE;
451 sd->right_min_size = 0; 451 sd->right_min_size = 0;
@@ -511,7 +511,7 @@ _efl_ui_panes_split_ratio_get(const Eo *obj, Efl_Ui_Panes_Data *sd)
511 else 511 else
512 edje_object_part_drag_value_get(wd->resize_obj, "efl.bar", &w, &h); 512 edje_object_part_drag_value_get(wd->resize_obj, "efl.bar", &w, &h);
513 513
514 if (sd->dir == EFL_UI_DIR_HORIZONTAL) 514 if (sd->dir == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
515 return h; 515 return h;
516 else return w; 516 else return w;
517} 517}
@@ -524,7 +524,7 @@ _efl_ui_panes_split_ratio_set(Eo *obj, Efl_Ui_Panes_Data *sd, double ratio)
524 if (ratio < 0.0) ratio = 0.0; 524 if (ratio < 0.0) ratio = 0.0;
525 else if (ratio > 1.0) ratio = 1.0; 525 else if (ratio > 1.0) ratio = 1.0;
526 526
527 if (sd->dir == EFL_UI_DIR_HORIZONTAL) 527 if (sd->dir == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
528 { 528 {
529 if (elm_widget_is_legacy(obj)) 529 if (elm_widget_is_legacy(obj))
530 edje_object_part_drag_value_set(wd->resize_obj, "elm.bar", 0.0, ratio); 530 edje_object_part_drag_value_set(wd->resize_obj, "elm.bar", 0.0, ratio);
@@ -541,13 +541,13 @@ _efl_ui_panes_split_ratio_set(Eo *obj, Efl_Ui_Panes_Data *sd, double ratio)
541} 541}
542 542
543EOLIAN static void 543EOLIAN static void
544_efl_ui_panes_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Panes_Data *sd, Efl_Ui_Dir dir) 544_efl_ui_panes_efl_ui_layout_orientable_orientation_set(Eo *obj, Efl_Ui_Panes_Data *sd, Efl_Ui_Layout_Orientation dir)
545{ 545{
546 double size = elm_panes_content_left_size_get(obj); 546 double size = elm_panes_content_left_size_get(obj);
547 if (efl_ui_dir_is_horizontal(dir, EINA_FALSE)) 547 if (efl_ui_layout_orientation_is_horizontal(dir, EINA_FALSE))
548 dir = EFL_UI_DIR_HORIZONTAL; 548 dir = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
549 else 549 else
550 dir = EFL_UI_DIR_VERTICAL; 550 dir = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
551 551
552 sd->dir = dir; 552 sd->dir = dir;
553 efl_ui_widget_theme_apply(obj); 553 efl_ui_widget_theme_apply(obj);
@@ -557,8 +557,8 @@ _efl_ui_panes_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Panes_Data *sd, Efl
557 elm_panes_content_left_size_set(obj, size); 557 elm_panes_content_left_size_set(obj, size);
558} 558}
559 559
560EOLIAN static Efl_Ui_Dir 560EOLIAN static Efl_Ui_Layout_Orientation
561_efl_ui_panes_efl_ui_direction_direction_get(const Eo *obj EINA_UNUSED, Efl_Ui_Panes_Data *sd) 561_efl_ui_panes_efl_ui_layout_orientable_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Panes_Data *sd)
562{ 562{
563 return sd->dir; 563 return sd->dir;
564} 564}
@@ -834,14 +834,14 @@ elm_panes_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
834{ 834{
835 EFL_UI_PANES_CHECK(obj); 835 EFL_UI_PANES_CHECK(obj);
836 836
837 Efl_Ui_Dir dir; 837 Efl_Ui_Layout_Orientation dir;
838 838
839 if (horizontal) 839 if (horizontal)
840 dir = EFL_UI_DIR_HORIZONTAL; 840 dir = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
841 else 841 else
842 dir = EFL_UI_DIR_VERTICAL; 842 dir = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
843 843
844 efl_ui_direction_set(obj, dir); 844 efl_ui_layout_orientation_set(obj, dir);
845} 845}
846 846
847EAPI Eina_Bool 847EAPI Eina_Bool
@@ -849,9 +849,9 @@ elm_panes_horizontal_get(const Evas_Object *obj)
849{ 849{
850 EFL_UI_PANES_CHECK(obj) EINA_FALSE; 850 EFL_UI_PANES_CHECK(obj) EINA_FALSE;
851 851
852 Efl_Ui_Dir dir = efl_ui_direction_get(obj); 852 Efl_Ui_Layout_Orientation dir = efl_ui_layout_orientation_get(obj);
853 853
854 if (dir == EFL_UI_DIR_HORIZONTAL) 854 if (dir == EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL)
855 return EINA_TRUE; 855 return EINA_TRUE;
856 856
857 return EINA_FALSE; 857 return EINA_FALSE;
diff --git a/src/lib/elementary/efl_ui_panes.eo b/src/lib/elementary/efl_ui_panes.eo
index ca24cd7357..a9c2bbd089 100644
--- a/src/lib/elementary/efl_ui_panes.eo
+++ b/src/lib/elementary/efl_ui_panes.eo
@@ -1,4 +1,4 @@
1class @beta Efl.Ui.Panes extends Efl.Ui.Layout_Base implements Efl.Ui.Direction, 1class @beta Efl.Ui.Panes extends Efl.Ui.Layout_Base implements Efl.Ui.Layout_Orientable,
2 Efl.Ui.Clickable 2 Efl.Ui.Clickable
3{ 3{
4 [[Elementary panes class]] 4 [[Elementary panes class]]
@@ -48,7 +48,7 @@ class @beta Efl.Ui.Panes extends Efl.Ui.Layout_Base implements Efl.Ui.Direction,
48 implements { 48 implements {
49 Efl.Object.constructor; 49 Efl.Object.constructor;
50 Efl.Ui.Widget.theme_apply; 50 Efl.Ui.Widget.theme_apply;
51 Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $vertical.]] } 51 Efl.Ui.Layout_Orientable.orientation { get; set; [[Only supports $vertical and $horizontal. Default is $vertical.]] }
52 Efl.Part.part_get; 52 Efl.Part.part_get;
53 } 53 }
54 events { 54 events {
diff --git a/src/lib/elementary/efl_ui_panes_private.h b/src/lib/elementary/efl_ui_panes_private.h
index a95c3ba6e0..5b52ebd710 100644
--- a/src/lib/elementary/efl_ui_panes_private.h
+++ b/src/lib/elementary/efl_ui_panes_private.h
@@ -34,20 +34,20 @@ struct _Efl_Ui_Panes_Data
34 Eina_Bool move; 34 Eina_Bool move;
35 } move; 35 } move;
36 36
37 Efl_Ui_Dir dir; 37 Efl_Ui_Layout_Orientation dir;
38 double left_min_relative_size; 38 double left_min_relative_size;
39 double right_min_relative_size; 39 double right_min_relative_size;
40 Eina_Size2D first_min, second_min; 40 Eina_Size2D first_min, second_min;
41 double first_min_split_ratio, second_min_split_ratio; 41 double first_min_split_ratio, second_min_split_ratio;
42 42
43 Evas_Coord left_min_size; 43 Evas_Coord left_min_size;
44 Evas_Coord right_min_size; 44 Evas_Coord right_min_size;
45 Eina_Bool double_clicked : 1; 45 Eina_Bool double_clicked : 1;
46 Eina_Bool fixed : 1; 46 Eina_Bool fixed : 1;
47 Eina_Bool left_min_size_is_relative : 1; 47 Eina_Bool left_min_size_is_relative : 1;
48 Eina_Bool right_min_size_is_relative : 1; 48 Eina_Bool right_min_size_is_relative : 1;
49 Eina_Bool first_hint_min_allow : 1; 49 Eina_Bool first_hint_min_allow : 1;
50 Eina_Bool second_hint_min_allow : 1; 50 Eina_Bool second_hint_min_allow : 1;
51}; 51};
52 52
53/** 53/**
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index c65d9bdcff..ee7936511f 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -62,37 +62,9 @@ _progress_status_free(Efl_Ui_Progress_Status *ps)
62} 62}
63 63
64static inline Eina_Bool 64static inline Eina_Bool
65_is_horizontal(Efl_Ui_Dir dir) 65_is_horizontal(Efl_Ui_Layout_Orientation dir)
66{ 66{
67 return efl_ui_dir_is_horizontal(dir, EINA_TRUE); 67 return efl_ui_layout_orientation_is_horizontal(dir, EINA_TRUE);
68}
69
70static inline Eina_Bool
71_is_inverted(Efl_Ui_Dir dir)
72{
73 if ((dir == EFL_UI_DIR_LEFT) || (dir == EFL_UI_DIR_UP))
74 return EINA_TRUE;
75
76 return EINA_FALSE;
77}
78
79static Efl_Ui_Dir
80_direction_get(Eina_Bool horizontal, Eina_Bool inverted)
81{
82 if (horizontal)
83 {
84 if (inverted)
85 return EFL_UI_DIR_LEFT;
86 else
87 return EFL_UI_DIR_RIGHT;
88 }
89 else
90 {
91 if (inverted)
92 return EFL_UI_DIR_UP;
93 else
94 return EFL_UI_DIR_DOWN;
95 }
96} 68}
97 69
98static void 70static void
@@ -133,7 +105,6 @@ _units_set(Evas_Object *obj)
133static void 105static void
134_val_set(Evas_Object *obj) 106_val_set(Evas_Object *obj)
135{ 107{
136 Eina_Bool rtl;
137 double pos; 108 double pos;
138 Efl_Ui_Progress_Status *ps; 109 Efl_Ui_Progress_Status *ps;
139 Eina_List *l; 110 Eina_List *l;
@@ -141,8 +112,6 @@ _val_set(Evas_Object *obj)
141 EFL_UI_PROGRESSBAR_DATA_GET(obj, sd); 112 EFL_UI_PROGRESSBAR_DATA_GET(obj, sd);
142 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 113 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
143 114
144 rtl = efl_ui_mirrored_get(obj);
145
146 EINA_LIST_FOREACH(sd->progress_status, l, ps) 115 EINA_LIST_FOREACH(sd->progress_status, l, ps)
147 { 116 {
148 if (EINA_DBL_EQ(ps->val_max, ps->val_min)) 117 if (EINA_DBL_EQ(ps->val_max, ps->val_min))
@@ -152,9 +121,7 @@ _val_set(Evas_Object *obj)
152 } 121 }
153 pos = (ps->val - ps->val_min)/(ps->val_max - ps->val_min); 122 pos = (ps->val - ps->val_min)/(ps->val_max - ps->val_min);
154 123
155 if ((!rtl && _is_inverted(sd->dir)) || 124 if (efl_ui_mirrored_get(obj) ^ efl_ui_layout_orientation_is_inverted(sd->dir))
156 (rtl && ((sd->dir == EFL_UI_DIR_UP) ||
157 (sd->dir == EFL_UI_DIR_RIGHT))))
158 pos = MAX_RATIO_LVL - pos; 125 pos = MAX_RATIO_LVL - pos;
159 126
160 edje_object_part_drag_value_set 127 edje_object_part_drag_value_set
@@ -287,14 +254,14 @@ _efl_ui_progressbar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Progressbar_Data *
287 254
288 if (elm_widget_is_legacy(obj)) 255 if (elm_widget_is_legacy(obj))
289 { 256 {
290 if (_is_inverted(sd->dir)) 257 if (efl_ui_layout_orientation_is_inverted(sd->dir))
291 elm_layout_signal_emit(obj, "elm,state,inverted,on", "elm"); 258 elm_layout_signal_emit(obj, "elm,state,inverted,on", "elm");
292 else 259 else
293 elm_layout_signal_emit(obj, "elm,state,inverted,off", "elm"); 260 elm_layout_signal_emit(obj, "elm,state,inverted,off", "elm");
294 } 261 }
295 else 262 else
296 { 263 {
297 if (_is_inverted(sd->dir)) 264 if (efl_ui_layout_orientation_is_inverted(sd->dir))
298 elm_layout_signal_emit(obj, "efl,state,inverted,on", "efl"); 265 elm_layout_signal_emit(obj, "efl,state,inverted,on", "efl");
299 else 266 else
300 elm_layout_signal_emit(obj, "efl,state,inverted,off", "efl"); 267 elm_layout_signal_emit(obj, "efl,state,inverted,off", "efl");
@@ -360,7 +327,7 @@ _efl_ui_progressbar_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Progressbar_Data
360 elm_widget_theme_klass_set(obj, "progressbar"); 327 elm_widget_theme_klass_set(obj, "progressbar");
361 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 328 efl_canvas_group_add(efl_super(obj, MY_CLASS));
362 329
363 priv->dir = EFL_UI_DIR_RIGHT; 330 priv->dir = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
364 priv->val = MIN_RATIO_LVL; 331 priv->val = MIN_RATIO_LVL;
365 priv->val_max = 1.0; 332 priv->val_max = 1.0;
366 group = _efl_ui_progressbar_theme_group_get(obj, priv); 333 group = _efl_ui_progressbar_theme_group_get(obj, priv);
@@ -447,7 +414,7 @@ _efl_ui_progressbar_pulse_mode_get(const Eo *obj EINA_UNUSED, Efl_Ui_Progressbar
447} 414}
448 415
449EOLIAN static void 416EOLIAN static void
450_efl_ui_progressbar_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, Efl_Ui_Dir dir) 417_efl_ui_progressbar_efl_ui_layout_orientable_orientation_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, Efl_Ui_Layout_Orientation dir)
451{ 418{
452 if (sd->dir == dir) return; 419 if (sd->dir == dir) return;
453 420
@@ -456,8 +423,8 @@ _efl_ui_progressbar_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Progressbar_D
456 efl_ui_widget_theme_apply(obj); 423 efl_ui_widget_theme_apply(obj);
457} 424}
458 425
459EOLIAN static Efl_Ui_Dir 426EOLIAN static Efl_Ui_Layout_Orientation
460_efl_ui_progressbar_efl_ui_direction_direction_get(const Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd) 427_efl_ui_progressbar_efl_ui_layout_orientable_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
461{ 428{
462 return sd->dir; 429 return sd->dir;
463} 430}
@@ -934,12 +901,13 @@ elm_progressbar_horizontal_get(const Evas_Object *obj)
934EAPI void 901EAPI void
935elm_progressbar_inverted_set(Evas_Object *obj, Eina_Bool inverted) 902elm_progressbar_inverted_set(Evas_Object *obj, Eina_Bool inverted)
936{ 903{
937 Efl_Ui_Dir dir; 904 Efl_Ui_Layout_Orientation dir;
938 EFL_UI_PROGRESSBAR_DATA_GET_OR_RETURN(obj, sd); 905 EFL_UI_PROGRESSBAR_DATA_GET_OR_RETURN(obj, sd);
939 906
940 dir = _direction_get(_is_horizontal(sd->dir), inverted); 907 dir = sd->dir & EFL_UI_LAYOUT_ORIENTATION_AXIS_BITMASK;
908 if (inverted) dir |= EFL_UI_LAYOUT_ORIENTATION_INVERTED;
941 909
942 efl_ui_direction_set(obj, dir); 910 efl_ui_layout_orientation_set(obj, dir);
943} 911}
944 912
945EAPI Eina_Bool 913EAPI Eina_Bool
@@ -947,18 +915,19 @@ elm_progressbar_inverted_get(const Evas_Object *obj)
947{ 915{
948 EFL_UI_PROGRESSBAR_DATA_GET_OR_RETURN(obj, sd, EINA_FALSE); 916 EFL_UI_PROGRESSBAR_DATA_GET_OR_RETURN(obj, sd, EINA_FALSE);
949 917
950 return _is_inverted(sd->dir); 918 return efl_ui_layout_orientation_is_inverted(sd->dir);
951} 919}
952 920
953EAPI void 921EAPI void
954elm_progressbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) 922elm_progressbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
955{ 923{
956 Efl_Ui_Dir dir; 924 Efl_Ui_Layout_Orientation dir;
957 EFL_UI_PROGRESSBAR_DATA_GET_OR_RETURN(obj, sd); 925 EFL_UI_PROGRESSBAR_DATA_GET_OR_RETURN(obj, sd);
958 926
959 dir = _direction_get(horizontal, _is_inverted(sd->dir)); 927 dir = horizontal ? EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL : EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
928 dir |= (sd->dir & EFL_UI_LAYOUT_ORIENTATION_INVERTED);
960 929
961 efl_ui_direction_set(obj, dir); 930 efl_ui_layout_orientation_set(obj, dir);
962} 931}
963 932
964typedef struct 933typedef struct
diff --git a/src/lib/elementary/efl_ui_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo
index d3301a81f3..f770709d96 100644
--- a/src/lib/elementary/efl_ui_progressbar.eo
+++ b/src/lib/elementary/efl_ui_progressbar.eo
@@ -1,5 +1,5 @@
1class @beta Efl.Ui.Progressbar extends Efl.Ui.Layout_Base implements Efl.Ui.Range_Display, Efl.Ui.Format, 1class @beta Efl.Ui.Progressbar extends Efl.Ui.Layout_Base implements Efl.Ui.Range_Display, Efl.Ui.Format,
2 Efl.Ui.Direction, Efl.Access.Value, 2 Efl.Ui.Layout_Orientable, Efl.Access.Value,
3 Efl.Text, Efl.Content, Efl.Text_Markup 3 Efl.Text, Efl.Content, Efl.Text_Markup
4{ 4{
5 [[Elementary progressbar class]] 5 [[Elementary progressbar class]]
@@ -47,7 +47,7 @@ class @beta Efl.Ui.Progressbar extends Efl.Ui.Layout_Base implements Efl.Ui.Rang
47 Efl.Ui.Widget.theme_apply; 47 Efl.Ui.Widget.theme_apply;
48 Efl.Ui.Range_Display.range_value { get; set; } 48 Efl.Ui.Range_Display.range_value { get; set; }
49 Efl.Ui.Range_Display.range_min_max {get; set; } 49 Efl.Ui.Range_Display.range_min_max {get; set; }
50 Efl.Ui.Direction.direction { get; set; } 50 Efl.Ui.Layout_Orientable.orientation { get; set; }
51 Efl.Ui.Format.format_cb { set; } 51 Efl.Ui.Format.format_cb { set; }
52 Efl.Part.part_get; 52 Efl.Part.part_get;
53 Efl.Access.Value.value_and_text { get; } 53 Efl.Access.Value.value_and_text { get; }
diff --git a/src/lib/elementary/efl_ui_progressbar_private.h b/src/lib/elementary/efl_ui_progressbar_private.h
index 7bdf8a98a0..7819d59cc4 100644
--- a/src/lib/elementary/efl_ui_progressbar_private.h
+++ b/src/lib/elementary/efl_ui_progressbar_private.h
@@ -43,7 +43,7 @@ struct _Efl_Ui_Progressbar_Data
43 void *format_cb_data; 43 void *format_cb_data;
44 Eina_Strbuf *format_strbuf; 44 Eina_Strbuf *format_strbuf;
45 45
46 Efl_Ui_Dir dir; /**< Orientation of the progressbar */ 46 Efl_Ui_Layout_Orientation dir; /**< Orientation of the progressbar */
47 47
48 Eina_Bool pulse : 1; /**< Whether object is put in the pulsing mode */ 48 Eina_Bool pulse : 1; /**< Whether object is put in the pulsing mode */
49 Eina_Bool pulse_state : 1; /**< To start the pulsing animation, otherwise to stop it */ 49 Eina_Bool pulse_state : 1; /**< To start the pulsing animation, otherwise to stop it */
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 6a5798d44b..3e5ff63cbf 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -43,24 +43,14 @@ _delay_change(void *data)
43} 43}
44 44
45static inline Eina_Bool 45static inline Eina_Bool
46_is_horizontal(Efl_Ui_Dir dir) 46_is_horizontal(Efl_Ui_Layout_Orientation dir)
47{ 47{
48 return efl_ui_dir_is_horizontal(dir, EINA_TRUE); 48 return efl_ui_layout_orientation_is_horizontal(dir, EINA_TRUE);
49}
50
51static inline Eina_Bool
52_is_inverted(Efl_Ui_Dir dir)
53{
54 if ((dir == EFL_UI_DIR_LEFT) || (dir == EFL_UI_DIR_DOWN))
55 return EINA_TRUE;
56
57 return EINA_FALSE;
58} 49}
59 50
60static void 51static void
61_efl_ui_slider_val_fetch(Evas_Object *obj, Efl_Ui_Slider_Data *sd, Eina_Bool user_event) 52_efl_ui_slider_val_fetch(Evas_Object *obj, Efl_Ui_Slider_Data *sd, Eina_Bool user_event)
62{ 53{
63 Eina_Bool rtl;
64 double posx = 0.0, posy = 0.0, pos = 0.0, val; 54 double posx = 0.0, posy = 0.0, pos = 0.0, val;
65 55
66 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 56 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@@ -74,10 +64,7 @@ _efl_ui_slider_val_fetch(Evas_Object *obj, Efl_Ui_Slider_Data *sd, Eina_Bool us
74 if (_is_horizontal(sd->dir)) pos = posx; 64 if (_is_horizontal(sd->dir)) pos = posx;
75 else pos = posy; 65 else pos = posy;
76 66
77 rtl = efl_ui_mirrored_get(obj); 67 if (efl_ui_mirrored_get(obj) ^ efl_ui_layout_orientation_is_inverted(sd->dir))
78 if ((!rtl && _is_inverted(sd->dir)) ||
79 (rtl && ((sd->dir == EFL_UI_DIR_UP) ||
80 (sd->dir == EFL_UI_DIR_RIGHT))))
81 { 68 {
82 pos = 1.0 - pos; 69 pos = 1.0 - pos;
83 } 70 }
@@ -102,7 +89,6 @@ _efl_ui_slider_val_set(Evas_Object *obj, Efl_Ui_Slider_Data *sd)
102{ 89{
103 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 90 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
104 91
105 Eina_Bool rtl;
106 double pos; 92 double pos;
107 93
108 if (sd->val_max > sd->val_min) 94 if (sd->val_max > sd->val_min)
@@ -118,10 +104,7 @@ _efl_ui_slider_val_set(Evas_Object *obj, Efl_Ui_Slider_Data *sd)
118 else if (pos > 1.0) 104 else if (pos > 1.0)
119 pos = 1.0; 105 pos = 1.0;
120 106
121 rtl = efl_ui_mirrored_get(obj); 107 if (efl_ui_mirrored_get(obj) ^ efl_ui_layout_orientation_is_inverted(sd->dir))
122 if ((!rtl && _is_inverted(sd->dir)) ||
123 (rtl && ((sd->dir == EFL_UI_DIR_UP) ||
124 (sd->dir == EFL_UI_DIR_RIGHT))))
125 { 108 {
126 pos = 1.0 - pos; 109 pos = 1.0 - pos;
127 } 110 }
@@ -226,7 +209,7 @@ _drag_up(void *data,
226 EFL_UI_SLIDER_DATA_GET(data, sd); 209 EFL_UI_SLIDER_DATA_GET(data, sd);
227 step = sd->step; 210 step = sd->step;
228 211
229 if (_is_inverted(sd->dir)) step *= -1.0; 212 if (efl_ui_layout_orientation_is_inverted(sd->dir)) step *= -1.0;
230 213
231 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); 214 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
232 if (elm_widget_is_legacy(obj)) 215 if (elm_widget_is_legacy(obj))
@@ -248,7 +231,7 @@ _drag_down(void *data,
248 EFL_UI_SLIDER_DATA_GET(data, sd); 231 EFL_UI_SLIDER_DATA_GET(data, sd);
249 step = -sd->step; 232 step = -sd->step;
250 233
251 if (_is_inverted(sd->dir)) step *= -1.0; 234 if (efl_ui_layout_orientation_is_inverted(sd->dir)) step *= -1.0;
252 235
253 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); 236 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
254 if (elm_widget_is_legacy(obj)) 237 if (elm_widget_is_legacy(obj))
@@ -269,7 +252,7 @@ _key_action_drag(Evas_Object *obj, const char *params)
269 { 252 {
270 if (!_is_horizontal(sd->dir)) 253 if (!_is_horizontal(sd->dir))
271 return EINA_FALSE; 254 return EINA_FALSE;
272 if (!_is_inverted(sd->dir)) 255 if (!efl_ui_layout_orientation_is_inverted(sd->dir))
273 _drag_down(obj, NULL, NULL, NULL); 256 _drag_down(obj, NULL, NULL, NULL);
274 else _drag_up(obj, NULL, NULL, NULL); 257 else _drag_up(obj, NULL, NULL, NULL);
275 } 258 }
@@ -277,7 +260,7 @@ _key_action_drag(Evas_Object *obj, const char *params)
277 { 260 {
278 if (!_is_horizontal(sd->dir)) 261 if (!_is_horizontal(sd->dir))
279 return EINA_FALSE; 262 return EINA_FALSE;
280 if (!_is_inverted(sd->dir)) 263 if (!efl_ui_layout_orientation_is_inverted(sd->dir))
281 _drag_up(obj, NULL, NULL, NULL); 264 _drag_up(obj, NULL, NULL, NULL);
282 else _drag_down(obj, NULL, NULL, NULL); 265 else _drag_down(obj, NULL, NULL, NULL);
283 } 266 }
@@ -285,7 +268,7 @@ _key_action_drag(Evas_Object *obj, const char *params)
285 { 268 {
286 if (_is_horizontal(sd->dir)) 269 if (_is_horizontal(sd->dir))
287 return EINA_FALSE; 270 return EINA_FALSE;
288 if (_is_inverted(sd->dir)) 271 if (efl_ui_layout_orientation_is_inverted(sd->dir))
289 _drag_up(obj, NULL, NULL, NULL); 272 _drag_up(obj, NULL, NULL, NULL);
290 else _drag_down(obj, NULL, NULL, NULL); 273 else _drag_down(obj, NULL, NULL, NULL);
291 } 274 }
@@ -293,7 +276,7 @@ _key_action_drag(Evas_Object *obj, const char *params)
293 { 276 {
294 if (_is_horizontal(sd->dir)) 277 if (_is_horizontal(sd->dir))
295 return EINA_FALSE; 278 return EINA_FALSE;
296 if (_is_inverted(sd->dir)) 279 if (efl_ui_layout_orientation_is_inverted(sd->dir))
297 _drag_down(obj, NULL, NULL, NULL); 280 _drag_down(obj, NULL, NULL, NULL);
298 else _drag_up(obj, NULL, NULL, NULL); 281 else _drag_up(obj, NULL, NULL, NULL);
299 } 282 }
@@ -354,14 +337,14 @@ _efl_ui_slider_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Slider_Data *sd,
354 if ((act == EFL_UI_ACTIVATE_UP) || 337 if ((act == EFL_UI_ACTIVATE_UP) ||
355 (act == EFL_UI_ACTIVATE_RIGHT)) 338 (act == EFL_UI_ACTIVATE_RIGHT))
356 { 339 {
357 if (!_is_inverted(sd->dir)) 340 if (!efl_ui_layout_orientation_is_inverted(sd->dir))
358 _drag_up(obj, NULL, NULL, NULL); 341 _drag_up(obj, NULL, NULL, NULL);
359 else _drag_down(obj, NULL, NULL, NULL); 342 else _drag_down(obj, NULL, NULL, NULL);
360 } 343 }
361 else if ((act == EFL_UI_ACTIVATE_DOWN) || 344 else if ((act == EFL_UI_ACTIVATE_DOWN) ||
362 (act == EFL_UI_ACTIVATE_LEFT)) 345 (act == EFL_UI_ACTIVATE_LEFT))
363 { 346 {
364 if (!_is_inverted(sd->dir)) 347 if (!efl_ui_layout_orientation_is_inverted(sd->dir))
365 _drag_down(obj, NULL, NULL, NULL); 348 _drag_down(obj, NULL, NULL, NULL);
366 else _drag_up(obj, NULL, NULL, NULL); 349 else _drag_up(obj, NULL, NULL, NULL);
367 } 350 }
@@ -442,14 +425,14 @@ _efl_ui_slider_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
442 425
443 if (elm_widget_is_legacy(obj)) 426 if (elm_widget_is_legacy(obj))
444 { 427 {
445 if (_is_inverted(sd->dir)) 428 if (efl_ui_layout_orientation_is_inverted(sd->dir))
446 efl_layout_signal_emit(obj, "elm,state,inverted,on", "elm"); 429 efl_layout_signal_emit(obj, "elm,state,inverted,on", "elm");
447 else 430 else
448 efl_layout_signal_emit(obj, "elm,state,inverted,off", "elm"); 431 efl_layout_signal_emit(obj, "elm,state,inverted,off", "elm");
449 } 432 }
450 else 433 else
451 { 434 {
452 if (_is_inverted(sd->dir)) 435 if (efl_ui_layout_orientation_is_inverted(sd->dir))
453 efl_layout_signal_emit(obj, "efl,state,inverted,on", "efl"); 436 efl_layout_signal_emit(obj, "efl,state,inverted,on", "efl");
454 else 437 else
455 efl_layout_signal_emit(obj, "efl,state,inverted,off", "efl"); 438 efl_layout_signal_emit(obj, "efl,state,inverted,off", "efl");
@@ -665,7 +648,7 @@ _efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *priv)
665 648
666 free(group); 649 free(group);
667 650
668 priv->dir = EFL_UI_DIR_RIGHT; 651 priv->dir = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
669 priv->val_max = 1.0; 652 priv->val_max = 1.0;
670 priv->step = SLIDER_STEP; 653 priv->step = SLIDER_STEP;
671 654
@@ -721,15 +704,15 @@ _efl_ui_slider_efl_object_destructor(Eo *obj,
721} 704}
722 705
723EOLIAN static void 706EOLIAN static void
724_efl_ui_slider_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Slider_Data *sd, Efl_Ui_Dir dir) 707_efl_ui_slider_efl_ui_layout_orientable_orientation_set(Eo *obj, Efl_Ui_Slider_Data *sd, Efl_Ui_Layout_Orientation dir)
725{ 708{
726 sd->dir = dir; 709 sd->dir = dir;
727 710
728 efl_ui_widget_theme_apply(obj); 711 efl_ui_widget_theme_apply(obj);
729} 712}
730 713
731EOLIAN static Efl_Ui_Dir 714EOLIAN static Efl_Ui_Layout_Orientation
732_efl_ui_slider_efl_ui_direction_direction_get(const Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd) 715_efl_ui_slider_efl_ui_layout_orientable_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
733{ 716{
734 return sd->dir; 717 return sd->dir;
735} 718}
diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo
index 9e8952afe3..4b703a3bf7 100644
--- a/src/lib/elementary/efl_ui_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -1,4 +1,4 @@
1class @beta Efl.Ui.Slider extends Efl.Ui.Layout_Base implements Efl.Ui.Range_Interactive, Efl.Ui.Direction, 1class @beta Efl.Ui.Slider extends Efl.Ui.Layout_Base implements Efl.Ui.Range_Interactive, Efl.Ui.Layout_Orientable,
2 Efl.Access.Value, 2 Efl.Access.Value,
3 Efl.Access.Widget.Action 3 Efl.Access.Widget.Action
4{ 4{
@@ -13,7 +13,7 @@ class @beta Efl.Ui.Slider extends Efl.Ui.Layout_Base implements Efl.Ui.Range_Int
13 Efl.Ui.Range_Display.range_value { get; set; } 13 Efl.Ui.Range_Display.range_value { get; set; }
14 Efl.Ui.Range_Display.range_min_max {get; set; } 14 Efl.Ui.Range_Display.range_min_max {get; set; }
15 Efl.Ui.Range_Interactive.range_step { get; set; } 15 Efl.Ui.Range_Interactive.range_step { get; set; }
16 Efl.Ui.Direction.direction { get; set; } 16 Efl.Ui.Layout_Orientable.orientation { get; set; }
17 Efl.Access.Value.value_and_text { get; set; } 17 Efl.Access.Value.value_and_text { get; set; }
18 Efl.Access.Value.range { get; } 18 Efl.Access.Value.range { get; }
19 Efl.Access.Value.increment { get; } 19 Efl.Access.Value.increment { get; }
diff --git a/src/lib/elementary/efl_ui_slider_interval.c b/src/lib/elementary/efl_ui_slider_interval.c
index 74131e5834..8256c7de22 100644
--- a/src/lib/elementary/efl_ui_slider_interval.c
+++ b/src/lib/elementary/efl_ui_slider_interval.c
@@ -45,7 +45,7 @@ _efl_ui_slider_interval_val_fetch(Evas_Object *obj, Efl_Ui_Slider_Interval_Data
45 else 45 else
46 efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable.slider"), 46 efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable.slider"),
47 &posx, &posy); 47 &posx, &posy);
48 if (efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) pos = posx; 48 if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE)) pos = posx;
49 else pos = posy; 49 else pos = posy;
50 50
51 if (elm_widget_is_legacy(obj)) 51 if (elm_widget_is_legacy(obj))
@@ -54,7 +54,7 @@ _efl_ui_slider_interval_val_fetch(Evas_Object *obj, Efl_Ui_Slider_Interval_Data
54 else 54 else
55 efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable2.slider"), 55 efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable2.slider"),
56 &posx2, &posy2); 56 &posx2, &posy2);
57 if (efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) pos2 = posx2; 57 if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE)) pos2 = posx2;
58 else pos2 = posy2; 58 else pos2 = posy2;
59 59
60 val = (pos * (sd->val_max - sd->val_min)) + sd->val_min; 60 val = (pos * (sd->val_max - sd->val_min)) + sd->val_min;
@@ -171,7 +171,7 @@ _efl_ui_slider_interval_down_knob(Evas_Object *obj, Efl_Ui_Slider_Interval_Data
171 &posx2, &posy2); 171 &posx2, &posy2);
172 } 172 }
173 173
174 if (efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 174 if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
175 { 175 {
176 diff1 = fabs(button_x - posx); 176 diff1 = fabs(button_x - posx);
177 diff2 = fabs(button_x - posx2); 177 diff2 = fabs(button_x - posx2);
diff --git a/src/lib/elementary/efl_ui_slider_private.h b/src/lib/elementary/efl_ui_slider_private.h
index 539784bc4c..7a6bec4bca 100644
--- a/src/lib/elementary/efl_ui_slider_private.h
+++ b/src/lib/elementary/efl_ui_slider_private.h
@@ -6,16 +6,16 @@
6typedef struct _Efl_Ui_Slider_Data Efl_Ui_Slider_Data; 6typedef struct _Efl_Ui_Slider_Data Efl_Ui_Slider_Data;
7struct _Efl_Ui_Slider_Data 7struct _Efl_Ui_Slider_Data
8{ 8{
9 Evas_Object *spacer; 9 Evas_Object *spacer;
10 Ecore_Timer *delay; 10 Ecore_Timer *delay;
11 11
12 double val, val_min, val_max, step; 12 double val, val_min, val_max, step;
13 13
14 Evas_Coord downx, downy; 14 Evas_Coord downx, downy;
15 Efl_Ui_Dir dir; 15 Efl_Ui_Layout_Orientation dir;
16 16
17 Eina_Bool spacer_down : 1; 17 Eina_Bool spacer_down : 1;
18 Eina_Bool frozen : 1; 18 Eina_Bool frozen : 1;
19}; 19};
20 20
21/** 21/**
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index 4941b41bde..71eaec160e 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -779,7 +779,7 @@ _efl_ui_spin_button_theme_group_get(Evas_Object *obj, Efl_Ui_Spin_Button_Data *s
779 } 779 }
780 } 780 }
781 781
782 if (efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 782 if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
783 eina_strbuf_append(new_group, "horizontal"); 783 eina_strbuf_append(new_group, "horizontal");
784 else 784 else
785 eina_strbuf_append(new_group, "vertical"); 785 eina_strbuf_append(new_group, "vertical");
@@ -885,7 +885,7 @@ _efl_ui_spin_button_efl_object_constructor(Eo *obj, Efl_Ui_Spin_Button_Data *sd)
885} 885}
886 886
887EOLIAN static void 887EOLIAN static void
888_efl_ui_spin_button_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Spin_Button_Data *sd, Efl_Ui_Dir dir) 888_efl_ui_spin_button_efl_ui_layout_orientable_orientation_set(Eo *obj, Efl_Ui_Spin_Button_Data *sd, Efl_Ui_Layout_Orientation dir)
889{ 889{
890 if (sd->dir == dir) return; 890 if (sd->dir == dir) return;
891 891
@@ -894,8 +894,8 @@ _efl_ui_spin_button_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Spin_Button_D
894 efl_ui_widget_theme_apply(obj); 894 efl_ui_widget_theme_apply(obj);
895} 895}
896 896
897EOLIAN static Efl_Ui_Dir 897EOLIAN static Efl_Ui_Layout_Orientation
898_efl_ui_spin_button_efl_ui_direction_direction_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd) 898_efl_ui_spin_button_efl_ui_layout_orientable_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd)
899{ 899{
900 return sd->dir; 900 return sd->dir;
901} 901}
diff --git a/src/lib/elementary/efl_ui_spin_button.eo b/src/lib/elementary/efl_ui_spin_button.eo
index fd6d360011..bf68be80cd 100644
--- a/src/lib/elementary/efl_ui_spin_button.eo
+++ b/src/lib/elementary/efl_ui_spin_button.eo
@@ -1,4 +1,4 @@
1class @beta Efl.Ui.Spin_Button extends Efl.Ui.Spin implements Efl.Ui.Focus.Composition, Efl.Ui.Direction, 1class @beta Efl.Ui.Spin_Button extends Efl.Ui.Spin implements Efl.Ui.Focus.Composition, Efl.Ui.Layout_Orientable,
2 Efl.Access.Widget.Action 2 Efl.Access.Widget.Action
3{ 3{
4 [[A Button Spin. 4 [[A Button Spin.
@@ -66,7 +66,7 @@ class @beta Efl.Ui.Spin_Button extends Efl.Ui.Spin implements Efl.Ui.Focus.Compo
66 Efl.Ui.Widget.widget_input_event_handler; 66 Efl.Ui.Widget.widget_input_event_handler;
67 Efl.Ui.Focus.Object.on_focus_update; 67 Efl.Ui.Focus.Object.on_focus_update;
68 Efl.Ui.Range_Display.range_value { set; } 68 Efl.Ui.Range_Display.range_value { set; }
69 Efl.Ui.Direction.direction { get; set; } 69 Efl.Ui.Layout_Orientable.orientation { get; set; }
70 Efl.Access.Object.i18n_name { get; } 70 Efl.Access.Object.i18n_name { get; }
71 Efl.Access.Value.value_and_text { get; set; } 71 Efl.Access.Value.value_and_text { get; set; }
72 Efl.Access.Value.range { get; } 72 Efl.Access.Value.range { get; }
diff --git a/src/lib/elementary/efl_ui_spin_button_private.h b/src/lib/elementary/efl_ui_spin_button_private.h
index 512207027b..06b868c87c 100644
--- a/src/lib/elementary/efl_ui_spin_button_private.h
+++ b/src/lib/elementary/efl_ui_spin_button_private.h
@@ -10,7 +10,7 @@ struct _Efl_Ui_Spin_Button_Data
10 Ecore_Timer *spin_timer; /**< a timer for a repeated spinner value change on mouse down */ 10 Ecore_Timer *spin_timer; /**< a timer for a repeated spinner value change on mouse down */
11 Ecore_Timer *longpress_timer; /**< a timer to detect long press. After longress timeout, 11 Ecore_Timer *longpress_timer; /**< a timer to detect long press. After longress timeout,
12 start continuous change of values until mouse up */ 12 start continuous change of values until mouse up */
13 Efl_Ui_Dir dir; 13 Efl_Ui_Layout_Orientation dir;
14 14
15 Eina_Bool entry_visible : 1; 15 Eina_Bool entry_visible : 1;
16 Eina_Bool entry_reactivate : 1; 16 Eina_Bool entry_reactivate : 1;
diff --git a/src/lib/elementary/efl_ui_tab_bar.c b/src/lib/elementary/efl_ui_tab_bar.c
index 0129121d7a..0bcd5d3c0b 100644
--- a/src/lib/elementary/efl_ui_tab_bar.c
+++ b/src/lib/elementary/efl_ui_tab_bar.c
@@ -348,7 +348,7 @@ _layout(Evas_Object *o,
348 348
349 EFL_UI_TAB_BAR_DATA_GET(obj, sd); 349 EFL_UI_TAB_BAR_DATA_GET(obj, sd);
350 350
351 horizontal = efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE); 351 horizontal = efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE);
352 352
353 _els_box_layout 353 _els_box_layout
354 (o, priv, horizontal, EINA_TRUE, efl_ui_mirrored_get(obj)); 354 (o, priv, horizontal, EINA_TRUE, efl_ui_mirrored_get(obj));
@@ -376,7 +376,7 @@ _efl_ui_tab_bar_efl_object_constructor(Eo *obj, Efl_Ui_Tab_Bar_Data *sd)
376 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC) 376 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
377 CRI("Failed to set layout!"); 377 CRI("Failed to set layout!");
378 378
379 sd->dir = EFL_UI_DIR_HORIZONTAL; 379 sd->dir = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
380 sd->bx = evas_object_box_add(evas_object_evas_get(obj)); 380 sd->bx = evas_object_box_add(evas_object_evas_get(obj));
381 evas_object_box_align_set(sd->bx, 0.5, 0.5); 381 evas_object_box_align_set(sd->bx, 0.5, 0.5);
382 evas_object_box_layout_set(sd->bx, _layout, obj, NULL); 382 evas_object_box_layout_set(sd->bx, _layout, obj, NULL);
diff --git a/src/lib/elementary/efl_ui_tab_bar_private.h b/src/lib/elementary/efl_ui_tab_bar_private.h
index 7e11cf017d..04000fa406 100644
--- a/src/lib/elementary/efl_ui_tab_bar_private.h
+++ b/src/lib/elementary/efl_ui_tab_bar_private.h
@@ -9,7 +9,7 @@ struct _Efl_Ui_Tab_Bar_Data
9 Efl_Canvas_Object *bx; 9 Efl_Canvas_Object *bx;
10 int cnt; 10 int cnt;
11 int cur; 11 int cur;
12 Efl_Ui_Dir dir; 12 Efl_Ui_Layout_Orientation dir;
13 13
14 Eina_List *tab_infos; 14 Eina_List *tab_infos;
15 Tab_Info *selected_tab; 15 Tab_Info *selected_tab;
diff --git a/src/lib/elementary/efl_ui_table.c b/src/lib/elementary/efl_ui_table.c
index 3c92dcb2d0..fd7ee11e4c 100644
--- a/src/lib/elementary/efl_ui_table.c
+++ b/src/lib/elementary/efl_ui_table.c
@@ -90,7 +90,7 @@ _efl_ui_table_last_position_get(Eo * obj, Efl_Ui_Table_Data *pd, int *last_col,
90 90
91 efl_pack_table_size_get(obj, &req_cols, &req_rows); 91 efl_pack_table_size_get(obj, &req_cols, &req_rows);
92 92
93 if (efl_ui_dir_is_horizontal(pd->fill_dir, EINA_TRUE)) 93 if (efl_ui_layout_orientation_is_horizontal(pd->fill_dir, EINA_TRUE))
94 { 94 {
95 EINA_INLIST_REVERSE_FOREACH(EINA_INLIST_GET(pd->items), gi) 95 EINA_INLIST_REVERSE_FOREACH(EINA_INLIST_GET(pd->items), gi)
96 { 96 {
@@ -220,7 +220,7 @@ _efl_ui_table_efl_object_constructor(Eo *obj, Efl_Ui_Table_Data *pd)
220 efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED); 220 efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED);
221 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER); 221 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER);
222 222
223 pd->fill_dir = EFL_UI_DIR_RIGHT; 223 pd->fill_dir = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
224 pd->last_col = -1; 224 pd->last_col = -1;
225 pd->last_row = -1; 225 pd->last_row = -1;
226 pd->req_cols = 0; 226 pd->req_cols = 0;
@@ -619,21 +619,21 @@ _efl_ui_table_efl_pack_table_table_contents_get(Eo *obj EINA_UNUSED, Efl_Ui_Tabl
619} 619}
620 620
621EOLIAN static void 621EOLIAN static void
622_efl_ui_table_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Ui_Dir dir) 622_efl_ui_table_efl_ui_layout_orientable_orientation_set(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Ui_Layout_Orientation dir)
623{ 623{
624 if (pd->fill_dir == dir) 624 if (pd->fill_dir == dir)
625 return; 625 return;
626 626
627 if (dir == EFL_UI_DIR_DEFAULT) 627 if (dir == EFL_UI_LAYOUT_ORIENTATION_DEFAULT)
628 dir = EFL_UI_DIR_RIGHT; 628 dir = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
629 629
630 pd->fill_dir = dir; 630 pd->fill_dir = dir;
631 631
632 efl_pack_layout_request(obj); 632 efl_pack_layout_request(obj);
633} 633}
634 634
635EOLIAN static Efl_Ui_Dir 635EOLIAN static Efl_Ui_Layout_Orientation
636_efl_ui_table_efl_ui_direction_direction_get(const Eo *obj EINA_UNUSED, Efl_Ui_Table_Data *pd) 636_efl_ui_table_efl_ui_layout_orientable_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Table_Data *pd)
637{ 637{
638 return pd->fill_dir; 638 return pd->fill_dir;
639} 639}
@@ -728,7 +728,7 @@ _efl_ui_table_efl_pack_pack(Eo *obj, Efl_Ui_Table_Data *pd, Efl_Gfx_Entity *subo
728 728
729 _efl_ui_table_last_position_get(obj, pd, &last_col, &last_row); 729 _efl_ui_table_last_position_get(obj, pd, &last_col, &last_row);
730 730
731 if (efl_ui_dir_is_horizontal(pd->fill_dir, EINA_TRUE)) 731 if (efl_ui_layout_orientation_is_horizontal(pd->fill_dir, EINA_TRUE))
732 { 732 {
733 last_col++; 733 last_col++;
734 if (pd->req_cols && (last_col >= pd->req_cols)) 734 if (pd->req_cols && (last_col >= pd->req_cols))
diff --git a/src/lib/elementary/efl_ui_table.eo b/src/lib/elementary/efl_ui_table.eo
index 463508bfbd..ec9a7552d9 100644
--- a/src/lib/elementary/efl_ui_table.eo
+++ b/src/lib/elementary/efl_ui_table.eo
@@ -1,18 +1,18 @@
1class @beta Efl.Ui.Table extends Efl.Ui.Widget implements Efl.Pack_Table, Efl.Pack_Layout, 1class @beta Efl.Ui.Table extends Efl.Ui.Widget implements Efl.Pack_Table, Efl.Pack_Layout,
2 Efl.Ui.Direction, Efl.Gfx.Arrangement 2 Efl.Ui.Layout_Orientable, Efl.Gfx.Arrangement
3{ 3{
4 [[Widget container that arranges its elements in a grid. 4 [[Widget container that arranges its elements in a grid.
5 5
6 The amount of rows and columns can be controlled with @Efl.Pack_Table.table_rows 6 The amount of rows and columns can be controlled with @Efl.Pack_Table.table_rows
7 and @Efl.Pack_Table.table_columns, and elements can be manually positioned with 7 and @Efl.Pack_Table.table_columns, and elements can be manually positioned with
8 @Efl.Pack_Table.pack_table. 8 @Efl.Pack_Table.pack_table.
9 Additionally, a fill direction can be defined with @Efl.Ui.Direction.direction and 9 Additionally, a fill direction can be defined with @Efl.Ui.Layout_Orientable.orientation and
10 elements added with @Efl.Pack.pack. Elements are then added following this direction 10 elements added with @Efl.Pack.pack. Elements are then added following this direction
11 (horizontal or vertical) and when the amount of columns or rows has been reached, 11 (horizontal or vertical) and when the amount of columns or rows has been reached,
12 a step is taken in the orthogonal direction. 12 a step is taken in the orthogonal direction.
13 In this second case there is no need to define both the amount of columns and rows, 13 In this second case there is no need to define both the amount of columns and rows,
14 as the table will expand as needed. 14 as the table will expand as needed.
15 The default fill direction is @Efl.Ui.Dir.right. 15 The default fill direction is @Efl.Ui.Layout_Orientation.horizontal.
16 ]] 16 ]]
17 methods { 17 methods {
18 @property homogeneous { 18 @property homogeneous {
@@ -37,7 +37,7 @@ class @beta Efl.Ui.Table extends Efl.Ui.Widget implements Efl.Pack_Table, Efl.Pa
37 Efl.Gfx.Entity.size { set; } 37 Efl.Gfx.Entity.size { set; }
38 Efl.Container.content_iterate; 38 Efl.Container.content_iterate;
39 Efl.Container.content_count; 39 Efl.Container.content_count;
40 Efl.Ui.Direction.direction { get; set; } 40 Efl.Ui.Layout_Orientable.orientation { get; set; }
41 Efl.Pack.pack_clear; 41 Efl.Pack.pack_clear;
42 Efl.Pack.unpack_all; 42 Efl.Pack.unpack_all;
43 Efl.Pack.unpack; 43 Efl.Pack.unpack;
diff --git a/src/lib/elementary/efl_ui_table_private.h b/src/lib/elementary/efl_ui_table_private.h
index 8d134ece73..ff261f1fae 100644
--- a/src/lib/elementary/efl_ui_table_private.h
+++ b/src/lib/elementary/efl_ui_table_private.h
@@ -36,7 +36,7 @@ struct _Efl_Ui_Table_Data
36 int cols, rows; 36 int cols, rows;
37 int req_cols, req_rows; // requested - 0 means infinite 37 int req_cols, req_rows; // requested - 0 means infinite
38 int last_col, last_row; // only used by pack api 38 int last_col, last_row; // only used by pack api
39 Efl_Ui_Dir fill_dir; // direction in which cells are added when using pack() 39 Efl_Ui_Layout_Orientation fill_dir; // direction in which cells are added when using pack()
40 struct { 40 struct {
41 double h, v; 41 double h, v;
42 Eina_Bool scalable: 1; 42 Eina_Bool scalable: 1;
diff --git a/src/lib/elementary/efl_ui_timepicker.c b/src/lib/elementary/efl_ui_timepicker.c
index 732f8aefdc..08a106f557 100644
--- a/src/lib/elementary/efl_ui_timepicker.c
+++ b/src/lib/elementary/efl_ui_timepicker.c
@@ -125,14 +125,14 @@ _fields_init(Eo *obj)
125 efl_ui_range_min_max_set(efl_added, 1, 12), 125 efl_ui_range_min_max_set(efl_added, 1, 12),
126 efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), 126 efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE),
127 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 127 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
128 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 128 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
129 efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj)); 129 efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj));
130 130
131 pd->min = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, 131 pd->min = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
132 efl_ui_range_min_max_set(efl_added, 0, 59), 132 efl_ui_range_min_max_set(efl_added, 0, 59),
133 efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE), 133 efl_ui_spin_button_circulate_set(efl_added, EINA_TRUE),
134 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 134 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE),
135 efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), 135 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
136 efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj)); 136 efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj));
137 137
138 pd->ampm = efl_add(EFL_UI_BUTTON_CLASS, obj, 138 pd->ampm = efl_add(EFL_UI_BUTTON_CLASS, obj,
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index 6a2557e4f5..0937836750 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -1888,7 +1888,7 @@ _palette_colors_load(Evas_Object *obj)
1888static inline void 1888static inline void
1889_palette_box_prepare(Eo *o) 1889_palette_box_prepare(Eo *o)
1890{ 1890{
1891 efl_ui_direction_set(o, EFL_UI_DIR_HORIZONTAL); 1891 efl_ui_layout_orientation_set(o, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
1892 efl_gfx_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1892 efl_gfx_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1893 efl_gfx_entity_visible_set(o, EINA_FALSE); 1893 efl_gfx_entity_visible_set(o, EINA_FALSE);
1894} 1894}
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index 18e38271ee..a8f35e3aa4 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -59,7 +59,7 @@ _box_custom_layout(Evas_Object *o, Evas_Object_Box_Data *priv, void *data)
59 ELM_INDEX_DATA_GET(data, sd); 59 ELM_INDEX_DATA_GET(data, sd);
60 Eina_Bool horizontal; 60 Eina_Bool horizontal;
61 61
62 horizontal = efl_ui_dir_is_horizontal(sd->dir, EINA_FALSE); 62 horizontal = efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_FALSE);
63 _els_box_layout(o, priv, horizontal, EINA_TRUE, efl_ui_mirrored_get(data)); 63 _els_box_layout(o, priv, horizontal, EINA_TRUE, efl_ui_mirrored_get(data));
64} 64}
65 65
@@ -242,7 +242,7 @@ _index_box_auto_fill(Evas_Object *obj,
242 if (sd->omit_enabled) 242 if (sd->omit_enabled)
243 { 243 {
244 o = edje_object_add(evas_object_evas_get(obj)); 244 o = edje_object_add(evas_object_evas_get(obj));
245 if (efl_ui_dir_is_horizontal(sd->dir, EINA_FALSE)) 245 if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_FALSE))
246 { 246 {
247 elm_widget_theme_object_set 247 elm_widget_theme_object_set
248 (obj, o, "index", "item/horizontal", style); 248 (obj, o, "index", "item/horizontal", style);
@@ -333,7 +333,7 @@ _index_box_auto_fill(Evas_Object *obj,
333 edje_object_mirrored_set(VIEW(it), rtl); 333 edje_object_mirrored_set(VIEW(it), rtl);
334 o = VIEW(it); 334 o = VIEW(it);
335 335
336 if (efl_ui_dir_is_horizontal(sd->dir, EINA_FALSE)) 336 if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_FALSE))
337 { 337 {
338 if (i & 0x1) 338 if (i & 0x1)
339 elm_widget_theme_object_set 339 elm_widget_theme_object_set
@@ -445,7 +445,7 @@ _elm_index_efl_ui_widget_theme_apply(Eo *obj, Elm_Index_Data *sd)
445 _index_box_clear(obj, 0); 445 _index_box_clear(obj, 0);
446 _index_box_clear(obj, 1); 446 _index_box_clear(obj, 1);
447 447
448 if (efl_ui_dir_is_horizontal(sd->dir, EINA_FALSE)) 448 if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_FALSE))
449 elm_widget_theme_element_set(obj, "base/horizontal"); 449 elm_widget_theme_element_set(obj, "base/horizontal");
450 else 450 else
451 elm_widget_theme_element_set(obj, "base/vertical"); 451 elm_widget_theme_element_set(obj, "base/vertical");
@@ -662,7 +662,7 @@ _sel_eval(Evas_Object *obj,
662 x = (x * x) + (y * y); 662 x = (x * x) + (y * y);
663 if ((x < dist) || (!it_closest)) 663 if ((x < dist) || (!it_closest))
664 { 664 {
665 if (efl_ui_dir_is_horizontal(sd->dir, EINA_FALSE)) 665 if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_FALSE))
666 cdv = (double)(xx - bx) / (double)bw; 666 cdv = (double)(xx - bx) / (double)bw;
667 else 667 else
668 cdv = (double)(yy - by) / (double)bh; 668 cdv = (double)(yy - by) / (double)bh;
@@ -902,7 +902,7 @@ _on_mouse_move(void *data,
902 (wd->resize_obj, "elm.dragable.pointer", 902 (wd->resize_obj, "elm.dragable.pointer",
903 (!edje_object_mirrored_get(wd->resize_obj)) ? 903 (!edje_object_mirrored_get(wd->resize_obj)) ?
904 x : (x - w), y); 904 x : (x - w), y);
905 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_FALSE) && (sd->event_rect[1])) 905 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_FALSE) && (sd->event_rect[1]))
906 { 906 {
907 if (adx > minw) 907 if (adx > minw)
908 { 908 {
@@ -1093,7 +1093,7 @@ _elm_index_efl_canvas_group_group_add(Eo *obj, Elm_Index_Data *priv)
1093 evas_object_show(priv->bx[0]); 1093 evas_object_show(priv->bx[0]);
1094