diff options
| author | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-09-19 18:51:58 +0900 |
|---|---|---|
| committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-09-19 18:53:35 +0900 |
| commit | 706cf9c48824352014fe1827a8dffbfca912f6fd (patch) | |
| tree | 514a7e1858f31114fcff41cdec14a8080b49b7b6 | |
| parent | 40e23ca4593358574b2d9cfb62873fda7dce1c1c (diff) | |
| download | efl-706cf9c48824352014fe1827a8dffbfca912f6fd.tar.gz | |
elm: Fix invalid uses of Efl.Orientation
I think this closes the orientation vs. direction problem.
RTL vs. AnyRTL is not fully handled yet but this becomes a
widget-per-widget issue (eg. should a box in a RTL locale be mirrored if
set to horizontal?).
Fixes T5870
| -rw-r--r-- | src/examples/elementary/clock_example.js | 2 | ||||
| -rw-r--r-- | src/lib/elementary/efl_ui_layout_pack.c | 8 | ||||
| -rw-r--r-- | src/lib/elementary/efl_ui_layout_part_box.eo | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/examples/elementary/clock_example.js b/src/examples/elementary/clock_example.js index c15a54d63e..94eef0e136 100644 --- a/src/examples/elementary/clock_example.js +++ b/src/examples/elementary/clock_example.js @@ -9,7 +9,7 @@ bx = new efl.Efl.Ui.Box(win); bx.setHintWeight(1.0, 1.0); win.setContent(bx); bx.setVisible(true); -bx.setOrientation(efl.Efl.Orient.VERTICAL); +bx.setDirection(efl.Efl.Dir.VERTICAL); ck = new efl.Elm.Clock(win); bx.packEnd(ck); diff --git a/src/lib/elementary/efl_ui_layout_pack.c b/src/lib/elementary/efl_ui_layout_pack.c index f002a34f33..b77ebf7333 100644 --- a/src/lib/elementary/efl_ui_layout_pack.c +++ b/src/lib/elementary/efl_ui_layout_pack.c @@ -255,12 +255,12 @@ _efl_ui_layout_part_box_efl_pack_linear_pack_index_get(Eo *obj EINA_UNUSED, Efl_ ELM_PART_RETURN_VAL(efl_pack_index_get(pack, subobj)); } -EOLIAN static Efl_Orient -_efl_ui_layout_part_box_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd) +EOLIAN static Efl_Ui_Dir +_efl_ui_layout_part_box_efl_ui_direction_direction_get(Eo *obj EINA_UNUSED, Efl_Ui_Layout_Box_Data *pd) { - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_ORIENT_NONE); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_DIR_DEFAULT); - ELM_PART_RETURN_VAL(efl_orientation_get(efl_part(wd->resize_obj, pd->part))); + ELM_PART_RETURN_VAL(efl_ui_direction_get(efl_part(wd->resize_obj, pd->part))); } diff --git a/src/lib/elementary/efl_ui_layout_part_box.eo b/src/lib/elementary/efl_ui_layout_part_box.eo index a0e72964f6..02e2be0e90 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 @@ class Efl.Ui.Layout.Part.Box (Efl.Object, Efl.Pack.Linear, - Efl.Orientation) + Efl.Ui.Direction) { [[Represents a Box created as part of a layout. @@ -22,7 +22,7 @@ class Efl.Ui.Layout.Part.Box (Efl.Object, Efl.Pack.Linear, Efl.Container.content_iterate; Efl.Container.content_count; Efl.Container.content_remove; - Efl.Orientation.orientation { get; } + Efl.Ui.Direction.direction { get; } Efl.Pack.pack_clear; Efl.Pack.unpack_all; Efl.Pack.unpack; |