jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=31279d2513f02588854c3720aa811be0ea83c0e4
commit 31279d2513f02588854c3720aa811be0ea83c0e4
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Fri Jun 3 15:55:29 2016 +0900
Efl.Pack: Replace pack_direction with Efl.Orientation
Since I first made the pack_direction before orientation
existed, the names didn't match. This should improve API
consistency.
---
src/bin/elementary/test_events.c | 3 +--
src/bin/elementary/test_ui_box.c | 16 ++++++++--------
src/bin/elementary/test_ui_grid.c | 20 ++++++++++----------
src/lib/edje/edje_containers.c | 2 +-
src/lib/edje/efl_canvas_layout_internal_box.eo | 5 +++--
src/lib/efl/interfaces/efl_pack_grid.eo | 4 ++--
src/lib/efl/interfaces/efl_pack_linear.eo | 11 -----------
src/lib/elementary/efl_ui_box.c | 4 ++--
src/lib/elementary/efl_ui_box.eo | 15 ++++-----------
src/lib/elementary/efl_ui_grid.c | 10 +++++-----
src/lib/elementary/efl_ui_grid.eo | 19 ++++++-------------
src/lib/elementary/efl_ui_layout_internal_box.eo | 5 +++--
src/lib/elementary/elm_layout_pack.c | 4 ++--
13 files changed, 47 insertions(+), 71 deletions(-)
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index 5fdfd94..fadbdee 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -192,8 +192,7 @@ test_events(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_in
win = elm_win_util_standard_add("buttons", "Buttons");
elm_win_autodel_set(win, EINA_TRUE);
- // FIXME: should be efl_orientation_set
- bx = eo_add(EFL_UI_BOX_CLASS, win, efl_pack_direction_set(eo_self,
EFL_ORIENT_VERTICAL));
+ bx = eo_add(EFL_UI_BOX_CLASS, win, efl_orientation_set(eo_self,
EFL_ORIENT_VERTICAL));
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(bx, -1, -1);
efl_pack(win, bx);
diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c
index be7f3b1..3ac8b47 100644
--- a/src/bin/elementary/test_ui_box.c
+++ b/src/bin/elementary/test_ui_box.c
@@ -121,7 +121,7 @@ static Eina_Bool
horiz_check_cb(void *data, const Eo_Event *event)
{
Eina_Bool chk = elm_check_selected_get(event->object);
- efl_pack_direction_set(data, chk ? EFL_ORIENT_HORIZONTAL :
EFL_ORIENT_VERTICAL);
+ efl_orientation_set(data, chk ? EFL_ORIENT_HORIZONTAL :
EFL_ORIENT_VERTICAL);
return EO_CALLBACK_CONTINUE;
}
@@ -217,7 +217,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_in
vbox = eo_add(EFL_UI_BOX_CLASS, win);
efl_pack_padding_set(vbox, 10, 10, EINA_TRUE);
- efl_pack_direction_set(vbox, EFL_ORIENT_DOWN);
+ efl_orientation_set(vbox, EFL_ORIENT_DOWN);
evas_object_size_hint_weight_set(vbox, 1, 1);
evas_object_size_hint_padding_set(vbox, 5, 5, 5, 5);
elm_win_resize_object_add(win, vbox);
@@ -244,7 +244,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_in
/* weights radio group */
bx = eo_add(EFL_UI_BOX_CLASS, win,
- efl_pack_direction_set(eo_self, EFL_ORIENT_DOWN));
+ efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
evas_object_size_hint_align_set(bx, 0, -1);
efl_pack(hbox, bx);
efl_gfx_visible_set(bx, 1);
@@ -298,7 +298,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_in
/* misc */
bx = eo_add(EFL_UI_BOX_CLASS, win,
- efl_pack_direction_set(eo_self, EFL_ORIENT_DOWN));
+ efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
evas_object_size_hint_align_set(bx, 0, -1);
evas_object_size_hint_weight_set(bx, 0, 1);
efl_pack(hbox, bx);
@@ -361,7 +361,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_in
/* requested size setter */
bx = eo_add(EFL_UI_BOX_CLASS, win,
- efl_pack_direction_set(eo_self, EFL_ORIENT_DOWN));
+ efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
evas_object_size_hint_align_set(bx, 0, -1);
evas_object_size_hint_weight_set(bx, 0, 1);
efl_pack(hbox, bx);
@@ -388,7 +388,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_in
/* inner box padding */
bx = eo_add(EFL_UI_BOX_CLASS, win,
- efl_pack_direction_set(eo_self, EFL_ORIENT_DOWN));
+ efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
evas_object_size_hint_align_set(bx, 0, -1);
evas_object_size_hint_weight_set(bx, 0, 1);
efl_pack(hbox, bx);
@@ -415,7 +415,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_in
/* outer margin */
bx = eo_add(EFL_UI_BOX_CLASS, win,
- efl_pack_direction_set(eo_self, EFL_ORIENT_DOWN));
+ efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
evas_object_size_hint_align_set(bx, 0, -1);
evas_object_size_hint_weight_set(bx, 0, 1);
efl_pack(hbox, bx);
@@ -442,7 +442,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_in
/* Box align */
bx = eo_add(EFL_UI_BOX_CLASS, win,
- efl_pack_direction_set(eo_self, EFL_ORIENT_DOWN));
+ efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
evas_object_size_hint_align_set(bx, 0, -1);
evas_object_size_hint_weight_set(bx, 1, 1);
efl_pack(hbox, bx);
diff --git a/src/bin/elementary/test_ui_grid.c
b/src/bin/elementary/test_ui_grid.c
index cb9ea1e..ab5399d 100644
--- a/src/bin/elementary/test_ui_grid.c
+++ b/src/bin/elementary/test_ui_grid.c
@@ -201,7 +201,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_i
vbox = eo_add(EFL_UI_BOX_CLASS, win);
efl_pack_padding_set(vbox, 10, 10, EINA_TRUE);
- efl_pack_direction_set(vbox, EFL_ORIENT_DOWN);
+ efl_orientation_set(vbox, EFL_ORIENT_DOWN);
evas_object_size_hint_weight_set(vbox, 1, 1);
evas_object_size_hint_padding_set(vbox, 5, 5, 5, 5);
elm_win_resize_object_add(win, vbox);
@@ -228,7 +228,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_i
/* weights radio group */
bx = eo_add(EFL_UI_BOX_CLASS, win,
- efl_pack_direction_set(eo_self, EFL_ORIENT_DOWN));
+ efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
evas_object_size_hint_align_set(bx, 0, -1);
efl_pack(hbox, bx);
efl_gfx_visible_set(bx, 1);
@@ -291,7 +291,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_i
/* requested size setter */
bx = eo_add(EFL_UI_BOX_CLASS, win,
- efl_pack_direction_set(eo_self, EFL_ORIENT_DOWN));
+ efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
evas_object_size_hint_align_set(bx, 0.5, -1);
evas_object_size_hint_weight_set(bx, 0, 1);
efl_pack(hbox, bx);
@@ -318,7 +318,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_i
/* inner box padding */
bx = eo_add(EFL_UI_BOX_CLASS, win,
- efl_pack_direction_set(eo_self, EFL_ORIENT_DOWN));
+ efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
evas_object_size_hint_align_set(bx, 0, -1);
evas_object_size_hint_weight_set(bx, 0, 1);
efl_pack(hbox, bx);
@@ -345,7 +345,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_i
/* outer margin */
bx = eo_add(EFL_UI_BOX_CLASS, win,
- efl_pack_direction_set(eo_self, EFL_ORIENT_DOWN));
+ efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
evas_object_size_hint_align_set(bx, 0, -1);
evas_object_size_hint_weight_set(bx, 0, 1);
efl_pack(hbox, bx);
@@ -372,7 +372,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_i
/* button margins */
bx = eo_add(EFL_UI_BOX_CLASS, win,
- efl_pack_direction_set(eo_self, EFL_ORIENT_DOWN));
+ efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
evas_object_size_hint_align_set(bx, 0, -1);
evas_object_size_hint_weight_set(bx, 1, 1);
efl_pack(hbox, bx);
@@ -399,7 +399,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_i
/* ro info */
bx = eo_add(EFL_UI_BOX_CLASS, win,
- efl_pack_direction_set(eo_self, EFL_ORIENT_DOWN));
+ efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
evas_object_size_hint_align_set(bx, 0, -1);
evas_object_size_hint_weight_set(bx, 1, 1);
efl_pack(hbox, bx);
@@ -536,7 +536,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED,
vbox = eo_add(EFL_UI_BOX_CLASS, win);
efl_pack_padding_set(vbox, 10, 10, EINA_TRUE);
- efl_pack_direction_set(vbox, EFL_ORIENT_DOWN);
+ efl_orientation_set(vbox, EFL_ORIENT_DOWN);
evas_object_size_hint_weight_set(vbox, 1, 1);
evas_object_size_hint_padding_set(vbox, 5, 5, 5, 5);
elm_win_resize_object_add(win, vbox);
@@ -581,7 +581,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED,
/* ro info */
bx = eo_add(EFL_UI_BOX_CLASS, win,
- efl_pack_direction_set(eo_self, EFL_ORIENT_DOWN));
+ efl_orientation_set(eo_self, EFL_ORIENT_DOWN));
evas_object_size_hint_align_set(bx, 0, -1);
evas_object_size_hint_weight_set(bx, 1, 1);
efl_pack(hbox, bx);
@@ -615,7 +615,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED,
efl_gfx_visible_set(f, 1);
efl_pack_grid_columns_set(grid, 4);
- efl_pack_grid_directions_set(grid, EFL_ORIENT_RIGHT, EFL_ORIENT_DOWN);
+ efl_pack_grid_orientation_set(grid, EFL_ORIENT_RIGHT, EFL_ORIENT_DOWN);
evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_content_set(f, grid);
evas_object_show(grid);
diff --git a/src/lib/edje/edje_containers.c b/src/lib/edje/edje_containers.c
index d0f4f0a..c629245 100644
--- a/src/lib/edje/edje_containers.c
+++ b/src/lib/edje/edje_containers.c
@@ -319,7 +319,7 @@
_efl_canvas_layout_internal_box_efl_container_content_count(Eo *obj, Edje_Box_Da
}
EOLIAN static Efl_Orient
-_efl_canvas_layout_internal_box_efl_pack_linear_pack_direction_get(Eo *obj,
Edje_Box_Data *pd)
+_efl_canvas_layout_internal_box_efl_orientation_orientation_get(Eo *obj,
Edje_Box_Data *pd)
{
const Edje_Part_Description_Box *desc =
(Edje_Part_Description_Box *) pd->rp->chosen_description;
diff --git a/src/lib/edje/efl_canvas_layout_internal_box.eo
b/src/lib/edje/efl_canvas_layout_internal_box.eo
index a84499d..5a28833 100644
--- a/src/lib/edje/efl_canvas_layout_internal_box.eo
+++ b/src/lib/edje/efl_canvas_layout_internal_box.eo
@@ -1,4 +1,5 @@
-class Efl.Canvas.Layout_Internal.Box (Eo.Base, Efl.Canvas.Layout_Internal,
Efl.Pack.Linear)
+class Efl.Canvas.Layout_Internal.Box (Eo.Base, Efl.Canvas.Layout_Internal,
Efl.Pack.Linear,
+ Efl.Orientation)
{
[[Represents a Box created as part of a layout.
@@ -24,6 +25,6 @@ class Efl.Canvas.Layout_Internal.Box (Eo.Base,
Efl.Canvas.Layout_Internal, Efl.P
Efl.Pack.Linear.pack_content_get;
Efl.Pack.Linear.pack_unpack_at;
Efl.Pack.Linear.pack_index_get;
- Efl.Pack.Linear.pack_direction.get;
+ Efl.Orientation.orientation.get;
}
}
diff --git a/src/lib/efl/interfaces/efl_pack_grid.eo
b/src/lib/efl/interfaces/efl_pack_grid.eo
index e48384b..3e532d2 100644
--- a/src/lib/efl/interfaces/efl_pack_grid.eo
+++ b/src/lib/efl/interfaces/efl_pack_grid.eo
@@ -68,10 +68,10 @@ interface Efl.Pack.Grid (Efl.Pack.Linear)
rows: int;
}
}
- @property grid_directions {
+ @property grid_orientation {
[[Primary and secondary up/left/right/down orientations for linear
apis.
- Default is right and down. Overrides
@Efl.Pack.Linear.pack_direction.
+ Default is right and down. Overrides @Efl.Orientation.orientation.
]]
set {}
get {}
diff --git a/src/lib/efl/interfaces/efl_pack_linear.eo
b/src/lib/efl/interfaces/efl_pack_linear.eo
index 31bc5ec..ffb4180 100644
--- a/src/lib/efl/interfaces/efl_pack_linear.eo
+++ b/src/lib/efl/interfaces/efl_pack_linear.eo
@@ -1,6 +1,3 @@
-import efl_orientation;
-
-/* FIXME: Efl.Pack.Linear */
interface Efl.Pack.Linear (Efl.Pack)
{
[[API for containers ]]
@@ -84,13 +81,5 @@ interface Efl.Pack.Linear (Efl.Pack)
}
return: Efl.Gfx; [[The child item if it could be removed.]]
}
- @property pack_direction {
- [[Primary up/left/right/down orientation. Default is right.]]
- set {}
- get {}
- values {
- orient: Efl.Orient;
- }
- }
}
}
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index fe30fe0..341afa5 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -563,7 +563,7 @@ _efl_ui_box_efl_container_content_iterate(Eo *obj,
Efl_Ui_Box_Data *pd EINA_UNUS
}
EOLIAN static void
-_efl_ui_box_efl_pack_linear_pack_direction_set(Eo *obj, Efl_Ui_Box_Data *pd,
Efl_Orient dir)
+_efl_ui_box_efl_orientation_orientation_set(Eo *obj, Efl_Ui_Box_Data *pd,
Efl_Orient dir)
{
switch (dir)
{
@@ -583,7 +583,7 @@ _efl_ui_box_efl_pack_linear_pack_direction_set(Eo *obj,
Efl_Ui_Box_Data *pd, Efl
}
EOLIAN static Efl_Orient
-_efl_ui_box_efl_pack_linear_pack_direction_get(Eo *obj EINA_UNUSED,
Efl_Ui_Box_Data *pd)
+_efl_ui_box_efl_orientation_orientation_get(Eo *obj EINA_UNUSED,
Efl_Ui_Box_Data *pd)
{
return pd->orient;
}
diff --git a/src/lib/elementary/efl_ui_box.eo b/src/lib/elementary/efl_ui_box.eo
index 9fe4ab6..dc45b9a 100644
--- a/src/lib/elementary/efl_ui_box.eo
+++ b/src/lib/elementary/efl_ui_box.eo
@@ -1,22 +1,19 @@
-class Efl.Ui.Box (Elm.Widget, Efl.Pack.Linear, Efl.Pack.Layout)
+class Efl.Ui.Box (Elm.Widget, Efl.Pack.Linear, Efl.Pack.Layout,
+ Efl.Orientation)
{
implements {
Eo.Base.constructor;
-
- // Smart obj
Evas.Object.Smart.add;
Evas.Object.Smart.del;
Evas.Object.Smart.calculate;
-
- // Focus
Elm.Widget.focus_direction;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.focus_next;
-
- // Packing interfaces
Efl.Container.content_iterate;
Efl.Container.content_count;
+ Efl.Orientation.orientation.set;
+ Efl.Orientation.orientation.get;
Efl.Pack.pack_clear;
Efl.Pack.unpack_all;
Efl.Pack.unpack;
@@ -33,10 +30,6 @@ class Efl.Ui.Box (Elm.Widget, Efl.Pack.Linear,
Efl.Pack.Layout)
Efl.Pack.Linear.pack_content_get;
Efl.Pack.Linear.pack_unpack_at;
Efl.Pack.Linear.pack_index_get;
- Efl.Pack.Linear.pack_direction.set;
- Efl.Pack.Linear.pack_direction.get;
-
- // Custom layouts
Efl.Pack.Layout.layout_update;
Efl.Pack.Layout.layout_request;
Efl.Pack.Layout.layout_engine.get;
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index ce25f17..05c847a 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -713,7 +713,7 @@ _efl_ui_grid_efl_pack_grid_grid_contents_get(Eo *obj,
Efl_Ui_Grid_Data *pd EINA_
}
EOLIAN static void
-_efl_ui_grid_efl_pack_linear_pack_direction_set(Eo *obj, Efl_Ui_Grid_Data *pd,
Efl_Orient orient)
+_efl_ui_grid_efl_orientation_orientation_set(Eo *obj, Efl_Ui_Grid_Data *pd,
Efl_Orient orient)
{
EINA_SAFETY_ON_FALSE_RETURN((orient % 90) == 0);
@@ -726,20 +726,20 @@ _efl_ui_grid_efl_pack_linear_pack_direction_set(Eo *obj,
Efl_Ui_Grid_Data *pd, E
if (!_horiz(pd->dir1))
pd->dir2 = EFL_ORIENT_RIGHT;
else
- pd->dir2 = EFL_ORIENT_DOWN;
+ pd->dir2 = EFL_ORIENT_DOWN;
}
efl_pack_layout_request(obj);
}
EOLIAN static Efl_Orient
-_efl_ui_grid_efl_pack_linear_pack_direction_get(Eo *obj EINA_UNUSED,
Efl_Ui_Grid_Data *pd)
+_efl_ui_grid_efl_orientation_orientation_get(Eo *obj EINA_UNUSED,
Efl_Ui_Grid_Data *pd)
{
return pd->dir1;
}
EOLIAN static void
-_efl_ui_grid_efl_pack_grid_grid_directions_set(Eo *obj, Efl_Ui_Grid_Data *pd,
Efl_Orient primary, Efl_Orient secondary)
+_efl_ui_grid_efl_pack_grid_grid_orientation_set(Eo *obj, Efl_Ui_Grid_Data *pd,
Efl_Orient primary, Efl_Orient secondary)
{
EINA_SAFETY_ON_FALSE_RETURN((primary % 90) == 0);
EINA_SAFETY_ON_FALSE_RETURN((secondary % 90) == 0);
@@ -767,7 +767,7 @@ _efl_ui_grid_efl_pack_grid_grid_directions_set(Eo *obj,
Efl_Ui_Grid_Data *pd, Ef
}
EOLIAN static void
-_efl_ui_grid_efl_pack_grid_grid_directions_get(Eo *obj EINA_UNUSED,
Efl_Ui_Grid_Data *pd, Efl_Orient *primary, Efl_Orient *secondary)
+_efl_ui_grid_efl_pack_grid_grid_orientation_get(Eo *obj EINA_UNUSED,
Efl_Ui_Grid_Data *pd, Efl_Orient *primary, Efl_Orient *secondary)
{
if (primary) *primary = pd->dir1;
if (secondary) *secondary = pd->dir2;
diff --git a/src/lib/elementary/efl_ui_grid.eo
b/src/lib/elementary/efl_ui_grid.eo
index 71d8289..ff86585 100644
--- a/src/lib/elementary/efl_ui_grid.eo
+++ b/src/lib/elementary/efl_ui_grid.eo
@@ -1,23 +1,20 @@
-class Efl.Ui.Grid (Elm.Widget, Efl.Pack.Grid, Efl.Pack.Layout)
+class Efl.Ui.Grid (Elm.Widget, Efl.Pack.Grid, Efl.Pack.Layout,
+ Efl.Orientation)
{
implements {
Eo.Base.constructor;
-
- // Smart obj
Evas.Object.Smart.add;
Evas.Object.Smart.del;
Evas.Object.Smart.calculate;
-
- // Focus
Elm.Widget.focus_direction;
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.focus_next;
Elm.Widget.theme_apply;
-
- // Packing interface
Efl.Container.content_iterate;
Efl.Container.content_count;
+ Efl.Orientation.orientation.set;
+ Efl.Orientation.orientation.get;
Efl.Pack.pack_clear;
Efl.Pack.unpack_all;
Efl.Pack.unpack;
@@ -34,13 +31,9 @@ class Efl.Ui.Grid (Elm.Widget, Efl.Pack.Grid,
Efl.Pack.Layout)
Efl.Pack.Grid.grid_columns.get;
Efl.Pack.Grid.grid_rows.set;
Efl.Pack.Grid.grid_rows.get;
- Efl.Pack.Grid.grid_directions.set;
- Efl.Pack.Grid.grid_directions.get;
+ Efl.Pack.Grid.grid_orientation.set;
+ Efl.Pack.Grid.grid_orientation.get;
Efl.Pack.Linear.pack_end;
- Efl.Pack.Linear.pack_direction.set;
- Efl.Pack.Linear.pack_direction.get;
-
- // Custom layouts
Efl.Pack.Layout.layout_update;
Efl.Pack.Layout.layout_request;
Efl.Pack.Layout.layout_engine.get;
diff --git a/src/lib/elementary/efl_ui_layout_internal_box.eo
b/src/lib/elementary/efl_ui_layout_internal_box.eo
index d183ac6..f945157 100644
--- a/src/lib/elementary/efl_ui_layout_internal_box.eo
+++ b/src/lib/elementary/efl_ui_layout_internal_box.eo
@@ -1,4 +1,5 @@
-class Efl.Ui.Layout_Internal.Box (Eo.Base, Efl.Pack.Linear)
+class Efl.Ui.Layout_Internal.Box (Eo.Base, Efl.Pack.Linear,
+ Efl.Orientation)
{
[[Represents a Box created as part of a layout.
@@ -21,6 +22,7 @@ class Efl.Ui.Layout_Internal.Box (Eo.Base, Efl.Pack.Linear)
Efl.Container.content_iterate;
Efl.Container.content_count;
Efl.Container.content_remove;
+ Efl.Orientation.orientation.get;
Efl.Pack.pack_clear;
Efl.Pack.unpack_all;
Efl.Pack.unpack;
@@ -33,6 +35,5 @@ class Efl.Ui.Layout_Internal.Box (Eo.Base, Efl.Pack.Linear)
Efl.Pack.Linear.pack_content_get;
Efl.Pack.Linear.pack_unpack_at;
Efl.Pack.Linear.pack_index_get;
- Efl.Pack.Linear.pack_direction.get;
}
}
diff --git a/src/lib/elementary/elm_layout_pack.c
b/src/lib/elementary/elm_layout_pack.c
index f8f66d2..bd5fc5a 100644
--- a/src/lib/elementary/elm_layout_pack.c
+++ b/src/lib/elementary/elm_layout_pack.c
@@ -258,11 +258,11 @@
_efl_ui_layout_internal_box_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED,
}
EOLIAN static Efl_Orient
-_efl_ui_layout_internal_box_efl_pack_linear_pack_direction_get(Eo *obj
EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd)
+_efl_ui_layout_internal_box_efl_orientation_orientation_get(Eo *obj
EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd)
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_ORIENT_NONE);
- ELM_PART_RETURN_VAL(efl_pack_direction_get(efl_part(wd->resize_obj,
pd->part)));
+ ELM_PART_RETURN_VAL(efl_orientation_get(efl_part(wd->resize_obj,
pd->part)));
}
--
