summaryrefslogtreecommitdiff
path: root/src/lib
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 /src/lib
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
Diffstat (limited to '')
-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
58 files changed, 398 insertions, 490 deletions
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 1094
1095 priv->delay_change_time = INDEX_DELAY_CHANGE_TIME; 1095 priv->delay_change_time = INDEX_DELAY_CHANGE_TIME;
1096 priv->dir = EFL_UI_DIR_VERTICAL; 1096 priv->dir = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
1097 1097
1098 if (edje_object_part_exists 1098 if (edje_object_part_exists
1099 (wd->resize_obj, "elm.swallow.index.1")) 1099 (wd->resize_obj, "elm.swallow.index.1"))
@@ -1191,16 +1191,16 @@ elm_index_add(Evas_Object *parent)
1191 1191
1192EAPI void elm_index_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) 1192EAPI void elm_index_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
1193{ 1193{
1194 Efl_Ui_Dir dir = horizontal ? EFL_UI_DIR_HORIZONTAL : EFL_UI_DIR_VERTICAL; 1194 Efl_Ui_Layout_Orientation dir = horizontal ? EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL : EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
1195 1195
1196 efl_ui_direction_set(obj, dir); 1196 efl_ui_layout_orientation_set(obj, dir);
1197} 1197}
1198 1198
1199EAPI Eina_Bool elm_index_horizontal_get(const Evas_Object *obj) 1199EAPI Eina_Bool elm_index_horizontal_get(const Evas_Object *obj)
1200{ 1200{
1201 Efl_Ui_Dir dir = efl_ui_direction_get(obj); 1201 Efl_Ui_Layout_Orientation dir = efl_ui_layout_orientation_get(obj);
1202 1202
1203 return efl_ui_dir_is_horizontal(dir, EINA_FALSE); 1203 return efl_ui_layout_orientation_is_horizontal(dir, EINA_FALSE);
1204} 1204}
1205 1205
1206EOLIAN static Eo * 1206EOLIAN static Eo *
@@ -1571,21 +1571,21 @@ _elm_index_item_letter_get(const Eo *item EINA_UNUSED, Elm_Index_Item_Data *it)
1571} 1571}
1572 1572
1573EOLIAN static void 1573EOLIAN static void
1574_elm_index_efl_ui_direction_direction_set(Eo *obj, Elm_Index_Data *sd, Efl_Ui_Dir dir) 1574_elm_index_efl_ui_layout_orientable_orientation_set(Eo *obj, Elm_Index_Data *sd, Efl_Ui_Layout_Orientation dir)
1575{ 1575{
1576 // Adjust direction to be either horizontal or vertical. 1576 // Adjust direction to be either horizontal or vertical.
1577 if (efl_ui_dir_is_horizontal(dir, EINA_FALSE)) 1577 if (efl_ui_layout_orientation_is_horizontal(dir, EINA_FALSE))
1578 dir = EFL_UI_DIR_HORIZONTAL; 1578 dir = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
1579 else 1579 else
1580 dir = EFL_UI_DIR_VERTICAL; 1580 dir = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
1581 1581
1582 sd->dir = dir; 1582 sd->dir = dir;
1583 1583
1584 efl_ui_widget_theme_apply(obj); 1584 efl_ui_widget_theme_apply(obj);
1585} 1585}
1586 1586
1587EOLIAN static Efl_Ui_Dir 1587EOLIAN static Efl_Ui_Layout_Orientation
1588_elm_index_efl_ui_direction_direction_get(const Eo *obj EINA_UNUSED, Elm_Index_Data *sd) 1588_elm_index_efl_ui_layout_orientable_orientation_get(const Eo *obj EINA_UNUSED, Elm_Index_Data *sd)
1589{ 1589{
1590 return sd->dir; 1590 return sd->dir;
1591} 1591}
diff --git a/src/lib/elementary/elm_index_eo.c b/src/lib/elementary/elm_index_eo.c
index 68bd184e59..862e228fa1 100644
--- a/src/lib/elementary/elm_index_eo.c
+++ b/src/lib/elementary/elm_index_eo.c
@@ -244,10 +244,10 @@ Eina_Error _elm_index_efl_ui_widget_theme_apply(Eo *obj, Elm_Index_Data *pd);
244void _elm_index_efl_ui_widget_on_access_update(Eo *obj, Elm_Index_Data *pd, Eina_Bool enable); 244void _elm_index_efl_ui_widget_on_access_update(Eo *obj, Elm_Index_Data *pd, Eina_Bool enable);
245 245
246 246
247void _elm_index_efl_ui_direction_direction_set(Eo *obj, Elm_Index_Data *pd, Efl_Ui_Dir dir); 247void _elm_index_efl_ui_layout_orientable_orientation_set(Eo *obj, Elm_Index_Data *pd, Efl_Ui_Layout_Orientation dir);
248 248
249 249
250Efl_Ui_Dir _elm_index_efl_ui_direction_direction_get(const Eo *obj, Elm_Index_Data *pd); 250Efl_Ui_Layout_Orientation _elm_index_efl_ui_layout_orientable_orientation_get(const Eo *obj, Elm_Index_Data *pd);
251 251
252 252
253Eina_List *_elm_index_efl_access_object_access_children_get(const Eo *obj, Elm_Index_Data *pd); 253Eina_List *_elm_index_efl_access_object_access_children_get(const Eo *obj, Elm_Index_Data *pd);
@@ -289,8 +289,8 @@ _elm_index_class_initializer(Efl_Class *klass)
289 EFL_OBJECT_OP_FUNC(efl_constructor, _elm_index_efl_object_constructor), 289 EFL_OBJECT_OP_FUNC(efl_constructor, _elm_index_efl_object_constructor),
290 EFL_OBJECT_OP_FUNC(efl_ui_widget_theme_apply, _elm_index_efl_ui_widget_theme_apply), 290 EFL_OBJECT_OP_FUNC(efl_ui_widget_theme_apply, _elm_index_efl_ui_widget_theme_apply),
291 EFL_OBJECT_OP_FUNC(efl_ui_widget_on_access_update, _elm_index_efl_ui_widget_on_access_update), 291 EFL_OBJECT_OP_FUNC(efl_ui_widget_on_access_update, _elm_index_efl_ui_widget_on_access_update),
292 EFL_OBJECT_OP_FUNC(efl_ui_direction_set, _elm_index_efl_ui_direction_direction_set), 292 EFL_OBJECT_OP_FUNC(efl_ui_layout_orientation_set, _elm_index_efl_ui_layout_orientable_orientation_set),
293 EFL_OBJECT_OP_FUNC(efl_ui_direction_get, _elm_index_efl_ui_direction_direction_get), 293 EFL_OBJECT_OP_FUNC(efl_ui_layout_orientation_get, _elm_index_efl_ui_layout_orientable_orientation_get),
294 EFL_OBJECT_OP_FUNC(efl_access_object_access_children_get, _elm_index_efl_access_object_access_children_get), 294 EFL_OBJECT_OP_FUNC(efl_access_object_access_children_get, _elm_index_efl_access_object_access_children_get),
295 ELM_INDEX_EXTRA_OPS 295 ELM_INDEX_EXTRA_OPS
296 ); 296 );
@@ -322,6 +322,6 @@ static const Efl_Class_Description _elm_index_class_desc = {
322 NULL 322 NULL
323}; 323};
324 324
325EFL_DEFINE_CLASS(elm_index_class_get, &_elm_index_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_DIRECTION_INTERFACE, EFL_UI_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); 325EFL_DEFINE_CLASS(elm_index_class_get, &_elm_index_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_LAYOUT_ORIENTABLE_INTERFACE, EFL_UI_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
326 326
327#include "elm_index_eo.legacy.c" 327#include "elm_index_eo.legacy.c"
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index f5eb2038b4..2b2e8aa117 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -986,18 +986,26 @@ _##_pfx##_efl_ui_widget_widget_input_event_handler(Eo *obj, _typ *_pd EINA_UNUSE
986 return EINA_TRUE; \ 986 return EINA_TRUE; \
987} 987}
988 988
989static inline Efl_Ui_Layout_Orientation
990efl_ui_layout_orientation_axis_get(Efl_Ui_Layout_Orientation orient)
991{
992 return orient & EFL_UI_LAYOUT_ORIENTATION_AXIS_BITMASK;
993}
994
995static inline Eina_Bool
996efl_ui_layout_orientation_is_inverted(Efl_Ui_Layout_Orientation orient)
997{
998 return orient & EFL_UI_LAYOUT_ORIENTATION_INVERTED;
999}
1000
989static inline Eina_Bool 1001static inline Eina_Bool
990efl_ui_dir_is_horizontal(Efl_Ui_Dir dir, Eina_Bool def_val) 1002efl_ui_layout_orientation_is_horizontal(Efl_Ui_Layout_Orientation orient, Eina_Bool def_val)
991{ 1003{
992 switch (dir) 1004 switch (orient & EFL_UI_LAYOUT_ORIENTATION_AXIS_BITMASK)
993 { 1005 {
994 case EFL_UI_DIR_DEFAULT: return !!def_val; 1006 case EFL_UI_LAYOUT_ORIENTATION_DEFAULT: return !!def_val;
995 case EFL_UI_DIR_HORIZONTAL: return EINA_TRUE; 1007 case EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL: return EINA_TRUE;
996 case EFL_UI_DIR_VERTICAL: return EINA_FALSE; 1008 case EFL_UI_LAYOUT_ORIENTATION_VERTICAL: return EINA_FALSE;
997 case EFL_UI_DIR_LTR: return EINA_TRUE;
998 case EFL_UI_DIR_RTL: return EINA_TRUE;
999 case EFL_UI_DIR_DOWN: return EINA_FALSE;
1000 case EFL_UI_DIR_UP: return EINA_FALSE;
1001 default: return !!def_val; 1009 default: return !!def_val;
1002 } 1010 }
1003} 1011}
diff --git a/src/lib/elementary/elm_slider.c b/src/lib/elementary/elm_slider.c
index d5a5f04ea8..da37a2279b 100644
--- a/src/lib/elementary/elm_slider.c
+++ b/src/lib/elementary/elm_slider.c
@@ -71,37 +71,9 @@ _delay_change(void *data)
71} 71}
72 72
73static inline Eina_Bool 73static inline Eina_Bool
74_is_horizontal(Efl_Ui_Dir dir) 74_is_horizontal(Efl_Ui_Layout_Orientation dir)
75{ 75{
76 return efl_ui_dir_is_horizontal(dir, EINA_TRUE); 76 return efl_ui_layout_orientation_is_horizontal(dir, EINA_TRUE);
77}
78
79static inline Eina_Bool
80_is_inverted(Efl_Ui_Dir dir)
81{
82 if ((dir == EFL_UI_DIR_LEFT) || (dir == EFL_UI_DIR_UP))
83 return EINA_TRUE;
84
85 return EINA_FALSE;
86}
87
88static Efl_Ui_Dir
89_direction_get(Eina_Bool horizontal, Eina_Bool inverted)
90{
91 if (horizontal)
92 {
93 if (inverted)
94 return EFL_UI_DIR_LEFT;
95 else
96 return EFL_UI_DIR_RIGHT;
97 }
98 else
99 {
100 if (inverted)
101 return EFL_UI_DIR_UP;
102 else
103 return EFL_UI_DIR_DOWN;
104 }
105} 77}
106 78
107static void 79static void
@@ -330,7 +302,7 @@ _drag_up(void *data,
330 EFL_UI_SLIDER_DATA_GET(data, sd); 302 EFL_UI_SLIDER_DATA_GET(data, sd);
331 step = sd->step; 303 step = sd->step;
332 304
333 if (_is_inverted(sd->dir)) step *= -1.0; 305 if (efl_ui_layout_orientation_is_inverted(sd->dir)) step *= -1.0;
334 306
335 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); 307 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
336 efl_ui_drag_step_move(efl_part(wd->resize_obj, "elm.dragable.slider"), 308 efl_ui_drag_step_move(efl_part(wd->resize_obj, "elm.dragable.slider"),
@@ -348,7 +320,7 @@ _drag_down(void *data,
348 EFL_UI_SLIDER_DATA_GET(data, sd); 320 EFL_UI_SLIDER_DATA_GET(data, sd);
349 step = -sd->step; 321 step = -sd->step;
350 322
351 if (_is_inverted(sd->dir)) step *= -1.0; 323 if (efl_ui_layout_orientation_is_inverted(sd->dir)) step *= -1.0;
352 324
353 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); 325 ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
354 efl_ui_drag_step_move(efl_part(wd->resize_obj, "elm.dragable.slider"), 326 efl_ui_drag_step_move(efl_part(wd->resize_obj, "elm.dragable.slider"),
@@ -365,7 +337,7 @@ _key_action_drag(Evas_Object *obj, const char *params)
365 { 337 {
366 if (!_is_horizontal(sd->dir)) 338 if (!_is_horizontal(sd->dir))
367 return EINA_FALSE; 339 return EINA_FALSE;
368 if (!_is_inverted(sd->dir)) 340 if (!efl_ui_layout_orientation_is_inverted(sd->dir))
369 _drag_down(obj, NULL, NULL, NULL); 341 _drag_down(obj, NULL, NULL, NULL);
370 else _drag_up(obj, NULL, NULL, NULL); 342 else _drag_up(obj, NULL, NULL, NULL);
371 } 343 }
@@ -373,7 +345,7 @@ _key_action_drag(Evas_Object *obj, const char *params)
373 { 345 {
374 if (!_is_horizontal(sd->dir)) 346 if (!_is_horizontal(sd->dir))
375 return EINA_FALSE; 347 return EINA_FALSE;
376 if (!_is_inverted(sd->dir)) 348 if (!efl_ui_layout_orientation_is_inverted(sd->dir))
377 _drag_up(obj, NULL, NULL, NULL); 349 _drag_up(obj, NULL, NULL, NULL);
378 else _drag_down(obj, NULL, NULL, NULL); 350 else _drag_down(obj, NULL, NULL, NULL);
379 } 351 }
@@ -381,7 +353,7 @@ _key_action_drag(Evas_Object *obj, const char *params)
381 { 353 {
382 if (_is_horizontal(sd->dir)) 354 if (_is_horizontal(sd->dir))
383 return EINA_FALSE; 355 return EINA_FALSE;
384 if (_is_inverted(sd->dir)) 356 if (efl_ui_layout_orientation_is_inverted(sd->dir))
385 _drag_up(obj, NULL, NULL, NULL); 357 _drag_up(obj, NULL, NULL, NULL);
386 else _drag_down(obj, NULL, NULL, NULL); 358 else _drag_down(obj, NULL, NULL, NULL);
387 } 359 }
@@ -389,7 +361,7 @@ _key_action_drag(Evas_Object *obj, const char *params)
389 { 361 {
390 if (_is_horizontal(sd->dir)) 362 if (_is_horizontal(sd->dir))
391 return EINA_FALSE; 363 return EINA_FALSE;
392 if (_is_inverted(sd->dir)) 364 if (efl_ui_layout_orientation_is_inverted(sd->dir))
393 _drag_down(obj, NULL, NULL, NULL); 365 _drag_down(obj, NULL, NULL, NULL);
394 else _drag_up(obj, NULL, NULL, NULL); 366 else _drag_up(obj, NULL, NULL, NULL);
395 } 367 }
@@ -505,7 +477,7 @@ _popup_update(Evas_Object *obj, Elm_Slider_Data *sd, Evas_Object *popup)
505 edje_object_scale_set(popup, efl_gfx_entity_scale_get(obj) * 477 edje_object_scale_set(popup, efl_gfx_entity_scale_get(obj) *
506 elm_config_scale_get()); 478 elm_config_scale_get());
507 479
508 if (!_is_inverted(sd2->dir)) 480 if (!efl_ui_layout_orientation_is_inverted(sd2->dir))
509 edje_object_signal_emit(popup, "elm,state,inverted,off", "elm"); 481 edje_object_signal_emit(popup, "elm,state,inverted,off", "elm");
510 else 482 else
511 edje_object_signal_emit(popup, "elm,state,inverted,on", "elm"); 483 edje_object_signal_emit(popup, "elm,state,inverted,on", "elm");
@@ -563,7 +535,6 @@ _popup_add(Elm_Slider_Data *sd, Eo *obj, Evas_Object **popup,
563void 535void
564_elm_slider_val_fetch(Evas_Object *obj, Elm_Slider_Data *pd, Eina_Bool user_event) 536_elm_slider_val_fetch(Evas_Object *obj, Elm_Slider_Data *pd, Eina_Bool user_event)
565{ 537{
566 Eina_Bool rtl;
567 double posx = 0.0, posy = 0.0, pos = 0.0, val; 538 double posx = 0.0, posy = 0.0, pos = 0.0, val;
568 double posx2 = 0.0, posy2 = 0.0, pos2 = 0.0, val2; 539 double posx2 = 0.0, posy2 = 0.0, pos2 = 0.0, val2;
569 Eina_Bool inverted = EINA_FALSE; 540 Eina_Bool inverted = EINA_FALSE;
@@ -574,18 +545,15 @@ _elm_slider_val_fetch(Evas_Object *obj, Elm_Slider_Data *pd, Eina_Bool user_even
574 545
575 efl_ui_drag_value_get(efl_part(wd->resize_obj, "elm.dragable.slider"), 546 efl_ui_drag_value_get(efl_part(wd->resize_obj, "elm.dragable.slider"),
576 &posx, &posy); 547 &posx, &posy);
577 if (efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) pos = posx; 548 if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE)) pos = posx;
578 else pos = posy; 549 else pos = posy;
579 550
580 efl_ui_drag_value_get(efl_part(wd->resize_obj, "elm.dragable2.slider"), 551 efl_ui_drag_value_get(efl_part(wd->resize_obj, "elm.dragable2.slider"),
581 &posx2, &posy2); 552 &posx2, &posy2);
582 if (efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) pos2 = posx2; 553 if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE)) pos2 = posx2;
583 else pos2 = posy2; 554 else pos2 = posy2;
584 555
585 rtl = efl_ui_mirrored_get(obj); 556 if (efl_ui_mirrored_get(obj) ^ efl_ui_layout_orientation_is_inverted(sd->dir))
586 if ((!rtl && _is_inverted(sd->dir)) ||
587 (rtl && ((sd->dir == EFL_UI_DIR_UP) ||
588 (sd->dir == EFL_UI_DIR_RIGHT))))
589 { 557 {
590 pos = 1.0 - pos; 558 pos = 1.0 - pos;
591 pos2 = 1.0 - pos2; 559 pos2 = 1.0 - pos2;
@@ -651,7 +619,6 @@ _elm_slider_val_fetch(Evas_Object *obj, Elm_Slider_Data *pd, Eina_Bool user_even
651void 619void
652_elm_slider_val_set(Evas_Object *obj, Elm_Slider_Data *pd EINA_UNUSED) 620_elm_slider_val_set(Evas_Object *obj, Elm_Slider_Data *pd EINA_UNUSED)
653{ 621{
654 Eina_Bool rtl;
655 double pos, pos2; 622 double pos, pos2;
656 623
657 EFL_UI_SLIDER_DATA_GET(obj, sd); 624 EFL_UI_SLIDER_DATA_GET(obj, sd);
@@ -677,10 +644,7 @@ _elm_slider_val_set(Evas_Object *obj, Elm_Slider_Data *pd EINA_UNUSED)
677 else if (pos2 > 1.0) 644 else if (pos2 > 1.0)
678 pos2 = 1.0; 645 pos2 = 1.0;
679 646
680 rtl = efl_ui_mirrored_get(obj); 647 if (efl_ui_mirrored_get(obj) ^ efl_ui_layout_orientation_is_inverted(sd->dir))
681 if ((!rtl && _is_inverted(sd->dir)) ||
682 (rtl && ((sd->dir == EFL_UI_DIR_UP) ||
683 (sd->dir == EFL_UI_DIR_RIGHT))))
684 { 648 {
685 pos = 1.0 - pos; 649 pos = 1.0 - pos;
686 pos2 = 1.0 - pos2; 650 pos2 = 1.0 - pos2;
@@ -718,7 +682,7 @@ _elm_slider_down_knob(Evas_Object *obj, Elm_Slider_Data *pd, double button_x, do
718 efl_ui_drag_value_get(efl_part(wd->resize_obj, "elm.dragable2.slider"), 682 efl_ui_drag_value_get(efl_part(wd->resize_obj, "elm.dragable2.slider"),
719 &posx2, &posy2); 683 &posx2, &posy2);
720 684
721 if (efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 685 if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
722 { 686 {
723 diff1 = fabs(button_x - posx); 687 diff1 = fabs(button_x - posx);
724 diff2 = fabs(button_x - posx2); 688 diff2 = fabs(button_x - posx2);
@@ -836,7 +800,7 @@ _elm_slider_efl_ui_widget_theme_apply(Eo *obj, Elm_Slider_Data *sd)
836 else 800 else
837 elm_layout_signal_emit(obj, "elm,slider,range,disable", "elm"); 801 elm_layout_signal_emit(obj, "elm,slider,range,disable", "elm");
838 802
839 if (_is_inverted(sd2->dir)) 803 if (efl_ui_layout_orientation_is_inverted(sd2->dir))
840 elm_layout_signal_emit(obj, "elm,state,inverted,on", "elm"); 804 elm_layout_signal_emit(obj, "elm,state,inverted,on", "elm");
841 else 805 else
842 elm_layout_signal_emit(obj, "elm,state,inverted,off", "elm"); 806 elm_layout_signal_emit(obj, "elm,state,inverted,off", "elm");
@@ -1235,12 +1199,13 @@ elm_slider_unit_format_get(const Evas_Object *obj)
1235EAPI void 1199EAPI void
1236elm_slider_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) 1200elm_slider_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
1237{ 1201{
1238 Efl_Ui_Dir dir; 1202 Efl_Ui_Layout_Orientation dir;
1239 EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd2); 1203 EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd2);
1240 1204
1241 dir = _direction_get(horizontal, _is_inverted(sd2->dir)); 1205 dir = horizontal ? EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL : EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
1206 dir |= (sd2->dir & EFL_UI_LAYOUT_ORIENTATION_INVERTED);
1242 1207
1243 efl_ui_direction_set(obj, dir); 1208 efl_ui_layout_orientation_set(obj, dir);
1244} 1209}
1245 1210
1246EAPI Eina_Bool 1211EAPI Eina_Bool
@@ -1248,8 +1213,8 @@ elm_slider_horizontal_get(const Evas_Object *obj)
1248{ 1213{
1249 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE); 1214 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
1250 1215
1251 Efl_Ui_Dir dir; 1216 Efl_Ui_Layout_Orientation dir;
1252 dir = efl_ui_direction_get(obj); 1217 dir = efl_ui_layout_orientation_get(obj);
1253 1218
1254 return _is_horizontal(dir); 1219 return _is_horizontal(dir);
1255} 1220}
@@ -1281,21 +1246,22 @@ elm_slider_value_get(const Evas_Object *obj)
1281EAPI void 1246EAPI void
1282elm_slider_inverted_set(Evas_Object *obj, Eina_Bool inverted) 1247elm_slider_inverted_set(Evas_Object *obj, Eina_Bool inverted)
1283{ 1248{
1284 Efl_Ui_Dir dir; 1249 Efl_Ui_Layout_Orientation dir;
1285 EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd2); 1250 EFL_UI_SLIDER_DATA_GET_OR_RETURN(obj, sd2);
1286 1251
1287 dir = _direction_get(_is_horizontal(sd2->dir), inverted); 1252 dir = sd2->dir & EFL_UI_LAYOUT_ORIENTATION_AXIS_BITMASK;
1253 if (inverted) dir |= EFL_UI_LAYOUT_ORIENTATION_INVERTED;
1288 1254
1289 efl_ui_direction_set(obj, dir); 1255 efl_ui_layout_orientation_set(obj, dir);
1290} 1256}
1291 1257
1292EAPI Eina_Bool 1258EAPI Eina_Bool
1293elm_slider_inverted_get(const Evas_Object *obj) 1259elm_slider_inverted_get(const Evas_Object *obj)
1294{ 1260{
1295 Efl_Ui_Dir dir; 1261 Efl_Ui_Layout_Orientation dir;
1296 dir = efl_ui_direction_get(obj); 1262 dir = efl_ui_layout_orientation_get(obj);
1297 1263
1298 return _is_inverted(dir); 1264 return efl_ui_layout_orientation_is_inverted(dir);
1299} 1265}
1300 1266
1301typedef struct 1267typedef struct
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index c3c87b05b5..e469a05898 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -116,7 +116,7 @@ _items_visibility_fix(Elm_Toolbar *obj,
116 if (sd->more_item) 116 if (sd->more_item)
117 { 117 {
118 evas_object_geometry_get(sd->VIEW(more_item), NULL, NULL, &ciw, &cih); 118 evas_object_geometry_get(sd->VIEW(more_item), NULL, NULL, &ciw, &cih);
119 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) *iw += cih; 119 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE)) *iw += cih;
120 else *iw += ciw; 120 else *iw += ciw;
121 } 121 }
122 122
@@ -125,7 +125,7 @@ _items_visibility_fix(Elm_Toolbar *obj,
125 if (it->prio.priority > sd->standard_priority) 125 if (it->prio.priority > sd->standard_priority)
126 { 126 {
127 evas_object_geometry_get(VIEW(it), NULL, NULL, &ciw, &cih); 127 evas_object_geometry_get(VIEW(it), NULL, NULL, &ciw, &cih);
128 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) *iw += cih; 128 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE)) *iw += cih;
129 else *iw += ciw; 129 else *iw += ciw;
130 //expand is the case where the bx_more stuff is used and the prio.visible is completly ignored. 130 //expand is the case where the bx_more stuff is used and the prio.visible is completly ignored.
131 //if this is the case - then every item in there is just visible in the box - nothing (beside the items in the other box is hidden) 131 //if this is the case - then every item in there is just visible in the box - nothing (beside the items in the other box is hidden)
@@ -298,7 +298,7 @@ _items_size_fit(Evas_Object *obj, Evas_Coord *bl, Evas_Coord view)
298 298
299 if (mw != -1 || mh != -1) 299 if (mw != -1 || mh != -1)
300 { 300 {
301 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) min = mh; 301 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE)) min = mh;
302 else min = mw; 302 else min = mw;
303 303
304 if ((!full) && ((sumf + min) > view)) 304 if ((!full) && ((sumf + min) > view))
@@ -396,7 +396,7 @@ _resize_job(void *data)
396 { 396 {
397 Evas_Coord iw = 0, ih = 0, more_w = 0, more_h = 0; 397 Evas_Coord iw = 0, ih = 0, more_w = 0, more_h = 0;
398 398
399 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 399 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
400 { 400 {
401 h = vh; 401 h = vh;
402 _items_visibility_fix(obj, sd, &ih, vh, EINA_FALSE, &more); 402 _items_visibility_fix(obj, sd, &ih, vh, EINA_FALSE, &more);
@@ -409,7 +409,7 @@ _resize_job(void *data)
409 evas_object_geometry_get 409 evas_object_geometry_get
410 (sd->VIEW(more_item), NULL, NULL, &more_w, &more_h); 410 (sd->VIEW(more_item), NULL, NULL, &more_w, &more_h);
411 411
412 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 412 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
413 { 413 {
414 if ((ih - more_h) <= vh) ih -= more_h; 414 if ((ih - more_h) <= vh) ih -= more_h;
415 } 415 }
@@ -422,8 +422,8 @@ _resize_job(void *data)
422 * individual items won't trigger a resize. Items are be 422 * individual items won't trigger a resize. Items are be
423 * readded below. */ 423 * readded below. */
424 evas_object_box_remove_all(sd->bx, EINA_FALSE); 424 evas_object_box_remove_all(sd->bx, EINA_FALSE);
425 if ((!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE) && (ih > vh)) || 425 if ((!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE) && (ih > vh)) ||
426 ( efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE) && (iw > vw)) || 426 ( efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE) && (iw > vw)) ||
427 more) 427 more)
428 { 428 {
429 Evas_Object *menu; 429 Evas_Object *menu;
@@ -477,7 +477,7 @@ _resize_job(void *data)
477 { 477 {
478 Evas_Coord iw = 0, ih = 0; 478 Evas_Coord iw = 0, ih = 0;
479 479
480 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 480 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
481 { 481 {
482 h = vh; 482 h = vh;
483 _items_visibility_fix(obj, sd, &ih, vh, EINA_FALSE, &more); 483 _items_visibility_fix(obj, sd, &ih, vh, EINA_FALSE, &more);
@@ -488,8 +488,8 @@ _resize_job(void *data)
488 _items_visibility_fix(obj, sd, &iw, vw, EINA_FALSE, &more); 488 _items_visibility_fix(obj, sd, &iw, vw, EINA_FALSE, &more);
489 } 489 }
490 evas_object_box_remove_all(sd->bx, EINA_FALSE); 490 evas_object_box_remove_all(sd->bx, EINA_FALSE);
491 if ((!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE) && (ih > vh)) || 491 if ((!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE) && (ih > vh)) ||
492 ( efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE) && (iw > vw)) || 492 ( efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE) && (iw > vw)) ||
493 more) 493 more)
494 { 494 {
495 EINA_INLIST_FOREACH(sd->items, it) 495 EINA_INLIST_FOREACH(sd->items, it)
@@ -517,12 +517,12 @@ _resize_job(void *data)
517 { 517 {
518 Evas_Coord iw = 0, ih = 0; 518 Evas_Coord iw = 0, ih = 0;
519 519
520 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 520 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
521 h = (vh >= mh) ? vh : mh; 521 h = (vh >= mh) ? vh : mh;
522 else 522 else
523 w = (vw >= mw) ? vw : mw; 523 w = (vw >= mw) ? vw : mw;
524 524
525 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 525 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
526 _items_visibility_fix(obj, sd, &ih, vh, EINA_TRUE, &more); 526 _items_visibility_fix(obj, sd, &ih, vh, EINA_TRUE, &more);
527 else 527 else
528 _items_visibility_fix(obj, sd, &iw, vw, EINA_TRUE, &more); 528 _items_visibility_fix(obj, sd, &iw, vw, EINA_TRUE, &more);
@@ -547,7 +547,7 @@ _resize_job(void *data)
547 else 547 else
548 evas_object_hide(sd->VIEW(more_item)); 548 evas_object_hide(sd->VIEW(more_item));
549 549
550 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 550 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
551 { 551 {
552 if (h > vh) _items_size_fit(obj, &h, vh); 552 if (h > vh) _items_size_fit(obj, &h, vh);
553 if (sd->item_count - sd->separator_count > 0) 553 if (sd->item_count - sd->separator_count > 0)
@@ -564,7 +564,7 @@ _resize_job(void *data)
564 } 564 }
565 else 565 else
566 { 566 {
567 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 567 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
568 h = (vh >= mh) ? vh : mh; 568 h = (vh >= mh) ? vh : mh;
569 else 569 else
570 w = (vw >= mw) ? vw : mw; 570 w = (vw >= mw) ? vw : mw;
@@ -578,7 +578,7 @@ _resize_job(void *data)
578 578
579 if (sd->transverse_expanded) 579 if (sd->transverse_expanded)
580 { 580 {
581 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 581 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
582 w = vw; 582 w = vw;
583 else 583 else
584 h = vh; 584 h = vh;
@@ -723,8 +723,8 @@ _elm_toolbar_nearest_visible_item_get(Evas_Object *obj, Elm_Object_Item *eo_it)
723 723
724 item_list = evas_object_box_children_get(sd->bx); 724 item_list = evas_object_box_children_get(sd->bx);
725 725
726 if ((!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE) && (iy < vy)) || 726 if ((!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE) && (iy < vy)) ||
727 ( efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE) && (iw < vw)) || 727 ( efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE) && (iw < vw)) ||
728 search_next) 728 search_next)
729 { 729 {
730 while ((item_list = eina_list_next(item_list))) 730 while ((item_list = eina_list_next(item_list)))
@@ -1319,7 +1319,7 @@ _item_theme_hook(Evas_Object *obj,
1319 1319
1320 _item_shrink_signal_emit(view, sd->shrink_mode); 1320 _item_shrink_signal_emit(view, sd->shrink_mode);
1321 1321
1322 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 1322 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
1323 elm_layout_signal_emit(view, "elm,orient,vertical", "elm"); 1323 elm_layout_signal_emit(view, "elm,orient,vertical", "elm");
1324 else 1324 else
1325 elm_layout_signal_emit(view, "elm,orient,horizontal", "elm"); 1325 elm_layout_signal_emit(view, "elm,orient,horizontal", "elm");
@@ -1329,7 +1329,7 @@ _item_theme_hook(Evas_Object *obj,
1329 elm_coords_finger_size_adjust(1, &mw, 1, &mh); 1329 elm_coords_finger_size_adjust(1, &mw, 1, &mh);
1330 if (sd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND) 1330 if (sd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND)
1331 { 1331 {
1332 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 1332 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
1333 { 1333 {
1334 evas_object_size_hint_weight_set(view, EVAS_HINT_EXPAND, -1.0); 1334 evas_object_size_hint_weight_set(view, EVAS_HINT_EXPAND, -1.0);
1335 evas_object_size_hint_align_set 1335 evas_object_size_hint_align_set
@@ -1421,7 +1421,7 @@ _sizing_eval(Evas_Object *obj)
1421 } 1421 }
1422 else if (sd->shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND) 1422 else if (sd->shrink_mode == ELM_TOOLBAR_SHRINK_EXPAND)
1423 { 1423 {
1424 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 1424 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
1425 { 1425 {
1426 minw = minw_bx + (w - vw); 1426 minw = minw_bx + (w - vw);
1427 if (minh_bx <= vh) minh_bx = vh; 1427 if (minh_bx <= vh) minh_bx = vh;
@@ -1436,7 +1436,7 @@ _sizing_eval(Evas_Object *obj)
1436 } 1436 }
1437 else 1437 else
1438 { 1438 {
1439 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 1439 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
1440 { 1440 {
1441 minw = minw_bx + (w - vw); 1441 minw = minw_bx + (w - vw);
1442 minh = h - vh; 1442 minh = h - vh;
@@ -1450,7 +1450,7 @@ _sizing_eval(Evas_Object *obj)
1450 1450
1451 if (sd->transverse_expanded) 1451 if (sd->transverse_expanded)
1452 { 1452 {
1453 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 1453 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
1454 minw_bx = vw; 1454 minw_bx = vw;
1455 else 1455 else
1456 minh_bx = vh; 1456 minh_bx = vh;
@@ -1497,7 +1497,7 @@ _elm_toolbar_efl_ui_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd)
1497 elm_widget_theme_object_set 1497 elm_widget_theme_object_set
1498 (obj, wd->resize_obj, "toolbar", "base", 1498 (obj, wd->resize_obj, "toolbar", "base",
1499 elm_widget_style_get(obj)); 1499 elm_widget_style_get(obj));
1500 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 1500 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
1501 edje_object_signal_emit(wd->resize_obj, "elm,orient,vertical", "elm"); 1501 edje_object_signal_emit(wd->resize_obj, "elm,orient,vertical", "elm");
1502 else 1502 else
1503 edje_object_signal_emit(wd->resize_obj, "elm,orient,horizontal", "elm"); 1503 edje_object_signal_emit(wd->resize_obj, "elm,orient,horizontal", "elm");
@@ -1505,7 +1505,7 @@ _elm_toolbar_efl_ui_widget_theme_apply(Eo *obj, Elm_Toolbar_Data *sd)
1505 if (!elm_layout_theme_set 1505 if (!elm_layout_theme_set
1506 (sd->more, "toolbar", "more", elm_widget_style_get(obj))) 1506 (sd->more, "toolbar", "more", elm_widget_style_get(obj)))
1507 CRI("Failed to set layout!"); 1507 CRI("Failed to set layout!");
1508 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 1508 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
1509 elm_object_signal_emit(sd->more, "elm,orient,vertical", "elm"); 1509 elm_object_signal_emit(sd->more, "elm,orient,vertical", "elm");
1510 else 1510 else
1511 elm_object_signal_emit(sd->more, "elm,orient,horizontal", "elm"); 1511 elm_object_signal_emit(sd->more, "elm,orient,horizontal", "elm");
@@ -1987,7 +1987,7 @@ _mouse_move_reorder(Elm_Toolbar_Item_Data *item,
1987 ELM_TOOLBAR_DATA_GET(WIDGET(item), sd); 1987 ELM_TOOLBAR_DATA_GET(WIDGET(item), sd);
1988 1988
1989 evas_object_geometry_get(VIEW(item), &x, &y, &w, &h); 1989 evas_object_geometry_get(VIEW(item), &x, &y, &w, &h);
1990 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 1990 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
1991 evas_object_move(item->proxy, x, ev->cur.canvas.y - (h / 2)); 1991 evas_object_move(item->proxy, x, ev->cur.canvas.y - (h / 2));
1992 else 1992 else
1993 evas_object_move(item->proxy, ev->cur.canvas.x - (w / 2), y); 1993 evas_object_move(item->proxy, ev->cur.canvas.x - (w / 2), y);
@@ -2265,7 +2265,7 @@ _layout(Evas_Object *o,
2265 2265
2266 ELM_TOOLBAR_DATA_GET(obj, sd); 2266 ELM_TOOLBAR_DATA_GET(obj, sd);
2267 2267
2268 horizontal = efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE); 2268 horizontal = efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE);
2269 2269
2270 _els_box_layout 2270 _els_box_layout
2271 (o, priv, horizontal, sd->homogeneous, efl_ui_mirrored_get(obj)); 2271 (o, priv, horizontal, sd->homogeneous, efl_ui_mirrored_get(obj));
@@ -2762,7 +2762,7 @@ _elm_toolbar_efl_canvas_group_group_add(Eo *obj, Elm_Toolbar_Data *priv)
2762 elm_interface_scrollable_objects_set(obj, edje, priv->hit_rect); 2762 elm_interface_scrollable_objects_set(obj, edje, priv->hit_rect);
2763 2763
2764 priv->standard_priority = -99999; 2764 priv->standard_priority = -99999;
2765 priv->dir = EFL_UI_DIR_HORIZONTAL; 2765 priv->dir = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
2766 2766
2767 elm_interface_scrollable_bounce_allow_set 2767 elm_interface_scrollable_bounce_allow_set
2768 (obj, _elm_config->thumbscroll_bounce_enable, EINA_FALSE); 2768 (obj, _elm_config->thumbscroll_bounce_enable, EINA_FALSE);
@@ -2800,7 +2800,7 @@ _elm_toolbar_efl_canvas_group_group_add(Eo *obj, Elm_Toolbar_Data *priv)
2800 priv->more = elm_layout_add(obj); 2800 priv->more = elm_layout_add(obj);
2801 if (!elm_layout_theme_set(priv->more, "toolbar", "more", "default")) 2801 if (!elm_layout_theme_set(priv->more, "toolbar", "more", "default"))
2802 CRI("Failed to set layout!"); 2802 CRI("Failed to set layout!");
2803 if (!efl_ui_dir_is_horizontal(priv->dir, EINA_TRUE)) 2803 if (!efl_ui_layout_orientation_is_horizontal(priv->dir, EINA_TRUE))
2804 elm_object_signal_emit(priv->more, "elm,orient,vertical", "elm"); 2804 elm_object_signal_emit(priv->more, "elm,orient,vertical", "elm");
2805 else 2805 else
2806 elm_object_signal_emit(priv->more, "elm,orient,horizontal", "elm"); 2806 elm_object_signal_emit(priv->more, "elm,orient,horizontal", "elm");
@@ -2920,7 +2920,7 @@ _elm_toolbar_coordinates_adjust(Elm_Toolbar_Item_Data *it)
2920 evas_object_geometry_get(VIEW(it), &ix, &iy, &iw, &ih); 2920 evas_object_geometry_get(VIEW(it), &ix, &iy, &iw, &ih);
2921 r = EINA_RECT(ix, iy, iw, ih); 2921 r = EINA_RECT(ix, iy, iw, ih);
2922 2922
2923 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 2923 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
2924 { 2924 {
2925 //TODO: Enhance it later. 2925 //TODO: Enhance it later.
2926 if ((ix < vx) || (ix + iw) > (vx + vw) || (iy + ih) > (vy + vh)) 2926 if ((ix < vx) || (ix + iw) > (vx + vw) || (iy + ih) > (vy + vh))
@@ -3483,7 +3483,7 @@ _elm_toolbar_menu_parent_get(const Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd)
3483EOLIAN static void 3483EOLIAN static void
3484_elm_toolbar_align_set(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd, double align) 3484_elm_toolbar_align_set(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd, double align)
3485{ 3485{
3486 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 3486 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
3487 { 3487 {
3488 if (sd->align != align) 3488 if (sd->align != align)
3489 evas_object_box_align_set(sd->bx, 0.5, align); 3489 evas_object_box_align_set(sd->bx, 0.5, align);
@@ -3712,17 +3712,17 @@ _elm_toolbar_item_state_prev(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *ite
3712} 3712}
3713 3713
3714EOLIAN static void 3714EOLIAN static void
3715_elm_toolbar_efl_ui_direction_direction_set(Eo *obj, Elm_Toolbar_Data *sd, Efl_Ui_Dir dir) 3715_elm_toolbar_efl_ui_layout_orientable_orientation_set(Eo *obj, Elm_Toolbar_Data *sd, Efl_Ui_Layout_Orientation dir)
3716{ 3716{
3717 // Adjust direction to be either horizontal or vertical. 3717 // Adjust direction to be either horizontal or vertical.
3718 if (efl_ui_dir_is_horizontal(dir, EINA_TRUE)) 3718 if (efl_ui_layout_orientation_is_horizontal(dir, EINA_TRUE))
3719 dir = EFL_UI_DIR_HORIZONTAL; 3719 dir = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
3720 else 3720 else
3721 dir = EFL_UI_DIR_VERTICAL; 3721 dir = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
3722 3722
3723 sd->dir = dir; 3723 sd->dir = dir;
3724 3724
3725 if (!efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE)) 3725 if (!efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
3726 evas_object_box_align_set(sd->bx, 0.5, sd->align); 3726 evas_object_box_align_set(sd->bx, 0.5, sd->align);
3727 else 3727 else
3728 evas_object_box_align_set(sd->bx, sd->align, 0.5); 3728 evas_object_box_align_set(sd->bx, sd->align, 0.5);
@@ -3730,8 +3730,8 @@ _elm_toolbar_efl_ui_direction_direction_set(Eo *obj, Elm_Toolbar_Data *sd, Efl_U
3730 _sizing_eval(obj); 3730 _sizing_eval(obj);
3731} 3731}
3732 3732
3733EOLIAN static Efl_Ui_Dir 3733EOLIAN static Efl_Ui_Layout_Orientation
3734_elm_toolbar_efl_ui_direction_direction_get(const Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd) 3734_elm_toolbar_efl_ui_layout_orientable_orientation_get(const Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd)
3735{ 3735{
3736 return sd->dir; 3736 return sd->dir;
3737} 3737}
@@ -3739,14 +3739,14 @@ _elm_toolbar_efl_ui_direction_direction_get(const Eo *obj EINA_UNUSED, Elm_Toolb
3739EAPI void 3739EAPI void
3740elm_toolbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal) 3740elm_toolbar_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
3741{ 3741{
3742 Efl_Ui_Dir dir; 3742 Efl_Ui_Layout_Orientation dir;
3743 3743
3744 if (horizontal) 3744 if (horizontal)
3745 dir = EFL_UI_DIR_HORIZONTAL; 3745 dir = EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL;
3746 else 3746 else
3747 dir = EFL_UI_DIR_VERTICAL; 3747 dir = EFL_UI_LAYOUT_ORIENTATION_VERTICAL;
3748 3748
3749 efl_ui_direction_set(obj, dir); 3749 efl_ui_layout_orientation_set(obj, dir);
3750} 3750}
3751 3751
3752EAPI Eina_Bool 3752EAPI Eina_Bool
@@ -3754,7 +3754,7 @@ elm_toolbar_horizontal_get(const Evas_Object *obj)
3754{ 3754{
3755 ELM_TOOLBAR_DATA_GET_OR_RETURN_VAL(obj, sd, EINA_FALSE); 3755 ELM_TOOLBAR_DATA_GET_OR_RETURN_VAL(obj, sd, EINA_FALSE);
3756 3756
3757 return efl_ui_dir_is_horizontal(sd->dir, EINA_TRUE); 3757 return efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE);
3758} 3758}
3759 3759
3760EOLIAN static unsigned int 3760EOLIAN static unsigned int
diff --git a/src/lib/elementary/elm_toolbar_eo.c b/src/lib/elementary/elm_toolbar_eo.c
index 4356aff25a..f27ea9b4e4 100644
--- a/src/lib/elementary/elm_toolbar_eo.c
+++ b/src/lib/elementary/elm_toolbar_eo.c
@@ -235,10 +235,10 @@ Eina_Rect _elm_toolbar_efl_ui_widget_focus_highlight_geometry_get(const Eo *obj,
235Elm_Widget_Item *_elm_toolbar_elm_widget_item_container_focused_item_get(const Eo *obj, Elm_Toolbar_Data *pd); 235Elm_Widget_Item *_elm_toolbar_elm_widget_item_container_focused_item_get(const Eo *obj, Elm_Toolbar_Data *pd);
236 236
237 237
238void _elm_toolbar_efl_ui_direction_direction_set(Eo *obj, Elm_Toolbar_Data *pd, Efl_Ui_Dir dir); 238void _elm_toolbar_efl_ui_layout_orientable_orientation_set(Eo *obj, Elm_Toolbar_Data *pd, Efl_Ui_Layout_Orientation dir);
239 239
240 240
241Efl_Ui_Dir _elm_toolbar_efl_ui_direction_direction_get(const Eo *obj, Elm_Toolbar_Data *pd); 241Efl_Ui_Layout_Orientation _elm_toolbar_efl_ui_layout_orientable_orientation_get(const Eo *obj, Elm_Toolbar_Data *pd);
242 242
243 243
244Eina_Bool _elm_toolbar_efl_ui_widget_focus_state_apply(Eo *obj, Elm_Toolbar_Data *pd, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Efl_Ui_Widget *redirect); 244Eina_Bool _elm_toolbar_efl_ui_widget_focus_state_apply(Eo *obj, Elm_Toolbar_Data *pd, Efl_Ui_Widget_Focus_State current_state, Efl_Ui_Widget_Focus_State *configured_state, Efl_Ui_Widget *redirect);
@@ -329,8 +329,8 @@ _elm_toolbar_class_initializer(Efl_Class *klass)
329 EFL_OBJECT_OP_FUNC(efl_ui_widget_input_event_handler, _elm_toolbar_efl_ui_widget_widget_input_event_handler), 329 EFL_OBJECT_OP_FUNC(efl_ui_widget_input_event_handler, _elm_toolbar_efl_ui_widget_widget_input_event_handler),
330 EFL_OBJECT_OP_FUNC(efl_ui_widget_focus_highlight_geometry_get, _elm_toolbar_efl_ui_widget_focus_highlight_geometry_get), 330 EFL_OBJECT_OP_FUNC(efl_ui_widget_focus_highlight_geometry_get, _elm_toolbar_efl_ui_widget_focus_highlight_geometry_get),
331 EFL_OBJECT_OP_FUNC(elm_widget_item_container_focused_item_get, _elm_toolbar_elm_widget_item_container_focused_item_get), 331 EFL_OBJECT_OP_FUNC(elm_widget_item_container_focused_item_get, _elm_toolbar_elm_widget_item_container_focused_item_get),
332 EFL_OBJECT_OP_FUNC(efl_ui_direction_set, _elm_toolbar_efl_ui_direction_direction_set), 332 EFL_OBJECT_OP_FUNC(efl_ui_layout_orientation_set, _elm_toolbar_efl_ui_layout_orientable_orientation_set),
333 EFL_OBJECT_OP_FUNC(efl_ui_direction_get, _elm_toolbar_efl_ui_direction_direction_get), 333 EFL_OBJECT_OP_FUNC(efl_ui_layout_orientation_get, _elm_toolbar_efl_ui_layout_orientable_orientation_get),
334 EFL_OBJECT_OP_FUNC(efl_ui_widget_focus_state_apply, _elm_toolbar_efl_ui_widget_focus_state_apply), 334 EFL_OBJECT_OP_FUNC(efl_ui_widget_focus_state_apply, _elm_toolbar_efl_ui_widget_focus_state_apply),
335 EFL_OBJECT_OP_FUNC(efl_access_widget_action_elm_actions_get, _elm_toolbar_efl_access_widget_action_elm_actions_get), 335 EFL_OBJECT_OP_FUNC(efl_access_widget_action_elm_actions_get, _elm_toolbar_efl_access_widget_action_elm_actions_get),
336 EFL_OBJECT_OP_FUNC(efl_access_object_access_children_get, _elm_toolbar_efl_access_object_access_children_get), 336 EFL_OBJECT_OP_FUNC(efl_access_object_access_children_get, _elm_toolbar_efl_access_object_access_children_get),
@@ -372,6 +372,6 @@ static const Efl_Class_Description _elm_toolbar_class_desc = {
372 NULL 372 NULL
373}; 373};
374 374
375EFL_DEFINE_CLASS(elm_toolbar_class_get, &_elm_toolbar_class_desc, EFL_UI_WIDGET_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_UI_DIRECTION_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_ACCESS_OBJECT_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL); 375EFL_DEFINE_CLASS(elm_toolbar_class_get, &_elm_toolbar_class_desc, EFL_UI_WIDGET_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_UI_LAYOUT_ORIENTABLE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_ACCESS_OBJECT_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
376 376
377#include "elm_toolbar_eo.legacy.c" 377#include "elm_toolbar_eo.legacy.c"
diff --git a/src/lib/elementary/elm_widget_index.h b/src/lib/elementary/elm_widget_index.h
index 3e39260abb..3afe97959f 100644
--- a/src/lib/elementary/elm_widget_index.h
+++ b/src/lib/elementary/elm_widget_index.h
@@ -36,7 +36,7 @@ struct _Elm_Index_Data
36 * small */ 36 * small */
37 Eina_List *omit; 37 Eina_List *omit;
38 38
39 Efl_Ui_Dir dir; 39 Efl_Ui_Layout_Orientation dir;
40 int level; 40 int level;
41 Evas_Coord dx, dy; 41 Evas_Coord dx, dy;
42 Ecore_Timer *delay; 42 Ecore_Timer *delay;
diff --git a/src/lib/elementary/elm_widget_toolbar.h b/src/lib/elementary/elm_widget_toolbar.h
index 899da4d37b..f98df224d8 100644
--- a/src/lib/elementary/elm_widget_toolbar.h
+++ b/src/lib/elementary/elm_widget_toolbar.h
@@ -49,7 +49,7 @@ struct _Elm_Toolbar_Data
49 Elm_Object_Select_Mode select_mode; 49 Elm_Object_Select_Mode select_mode;
50 Ecore_Timer *long_timer; 50 Ecore_Timer *long_timer;
51 Ecore_Job *resize_job; 51 Ecore_Job *resize_job;
52 Efl_Ui_Dir dir; 52 Efl_Ui_Layout_Orientation dir;
53 53
54 Eina_Bool long_press : 1; 54 Eina_Bool long_press : 1;
55 Eina_Bool homogeneous : 1; 55 Eina_Bool homogeneous : 1;