diff options
author | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-08-09 22:36:29 +0900 |
---|---|---|
committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-08-10 14:42:08 +0900 |
commit | b1488b98ded09ff510b56b4fe18a7a30f146167b (patch) | |
tree | 088addb73bd605d13bdb3e4a218f5d860b8d1635 /src/bin | |
parent | d4b4ee867be2819eea69ec7b92cd2843ae33c7c7 (diff) | |
download | efl-b1488b98ded09ff510b56b4fe18a7a30f146167b.tar.gz |
efl.ui.box: Switch to Efl.Ui.Dir (EO)
This makes the default box vertical, just like in legacy.
The flow box is horizontal by default.
Ref T5870
Diffstat (limited to 'src/bin')
-rw-r--r-- | src/bin/elementary/test_bg.c | 1 | ||||
-rw-r--r-- | src/bin/elementary/test_evas_mask.c | 4 | ||||
-rw-r--r-- | src/bin/elementary/test_evas_snapshot.c | 1 | ||||
-rw-r--r-- | src/bin/elementary/test_events.c | 3 | ||||
-rw-r--r-- | src/bin/elementary/test_gfx_filters.c | 8 | ||||
-rw-r--r-- | src/bin/elementary/test_photocam.c | 2 | ||||
-rw-r--r-- | src/bin/elementary/test_ui_box.c | 27 | ||||
-rw-r--r-- | src/bin/elementary/test_ui_grid.c | 14 | ||||
-rw-r--r-- | src/bin/elementary/test_win_inline.c | 3 |
9 files changed, 37 insertions, 26 deletions
diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c index 4fe764c640..ff043cde29 100644 --- a/src/bin/elementary/test_bg.c +++ b/src/bin/elementary/test_bg.c @@ -334,6 +334,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_ui_win_alpha_set(efl_added, 1)); box = efl_add(EFL_UI_BOX_CLASS, win, + efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), efl_gfx_size_hint_weight_set(efl_added, 1, 1), efl_content_set(win, efl_added)); diff --git a/src/bin/elementary/test_evas_mask.c b/src/bin/elementary/test_evas_mask.c index b3a4ffa532..482fe12e94 100644 --- a/src/bin/elementary/test_evas_mask.c +++ b/src/bin/elementary/test_evas_mask.c @@ -113,7 +113,7 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_ui_win_autodel_set(efl_added, 1)); box = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_added, EFL_ORIENT_DOWN), + efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0)); efl_content_set(win, box); @@ -156,7 +156,7 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event efl_content_set(efl_part(ly, "content"), gl); box2 = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_added, EFL_ORIENT_RIGHT), + efl_ui_direction_set(efl_added, EFL_UI_DIR_LTR), efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0), efl_pack(box, efl_added)); diff --git a/src/bin/elementary/test_evas_snapshot.c b/src/bin/elementary/test_evas_snapshot.c index 245d330067..f47756d672 100644 --- a/src/bin/elementary/test_evas_snapshot.c +++ b/src/bin/elementary/test_evas_snapshot.c @@ -183,6 +183,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _radius_set, win)); box = efl_add(EFL_UI_BOX_CLASS, win, + efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0), efl_pack_grid(grid, efl_added, 0, GRID_SIZE + 1, GRID_SIZE, 1)); diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c index f027d7249a..ae88b01c86 100644 --- a/src/bin/elementary/test_events.c +++ b/src/bin/elementary/test_events.c @@ -166,7 +166,8 @@ 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); - bx = efl_add(EFL_UI_BOX_CLASS, win, efl_orientation_set(efl_added, EFL_ORIENT_VERTICAL)); + bx = efl_add(EFL_UI_BOX_CLASS, win, + efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL)); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bx, -1, -1); efl_content_set(win, bx); diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c index e4cbecaa30..bc54e113f7 100644 --- a/src/bin/elementary/test_gfx_filters.c +++ b/src/bin/elementary/test_gfx_filters.c @@ -330,14 +330,14 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve efl_ui_win_autodel_set(efl_added, 1)); box = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_added, EFL_ORIENT_DOWN), + efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0)); efl_content_set(win, box); { box2 = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_added, EFL_ORIENT_HORIZONTAL), + efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), efl_gfx_size_hint_align_set(efl_added, -1.0, 0.0)); efl_pack(box, box2); @@ -374,7 +374,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve { box2 = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_added, EFL_ORIENT_HORIZONTAL), + efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), efl_gfx_size_hint_align_set(efl_added, -1.0, 0.5), efl_pack_padding_set(efl_added, 5, 5, 1), @@ -445,6 +445,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve efl_content_set(efl_part(split, "top"), flip); box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win, + efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0), efl_pack_align_set(efl_added, 0.5, 0.5)); @@ -460,6 +461,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve efl_pack(box2, o); o = box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win, + efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0), efl_pack_align_set(efl_added, 0.5, 0.5)); diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c index f7c0827549..1fc2bf816b 100644 --- a/src/bin/elementary/test_photocam.c +++ b/src/bin/elementary/test_photocam.c @@ -811,7 +811,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE efl_ui_win_autodel_set(efl_added, EINA_TRUE)); bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_added, EFL_ORIENT_DOWN), + efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN), efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND), efl_content_set(win, efl_added)); diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c index b005dbce00..517450fd93 100644 --- a/src/bin/elementary/test_ui_box.c +++ b/src/bin/elementary/test_ui_box.c @@ -132,7 +132,8 @@ flow_check_cb(void *data, const Efl_Event *event) efl_pack_unpack_all(box); efl_del(box); - box = efl_add(chk ? EFL_UI_BOX_FLOW_CLASS : EFL_UI_BOX_CLASS, win); + box = efl_add(chk ? EFL_UI_BOX_FLOW_CLASS : EFL_UI_BOX_CLASS, win, + efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); efl_content_set(parent, box); efl_key_wref_set(win, "box", box); @@ -145,7 +146,7 @@ horiz_check_cb(void *data, const Efl_Event *event) { Eina_Bool chk = elm_check_selected_get(event->object); Eo *box = efl_key_wref_get(data, "box"); - efl_orientation_set(box, chk ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL); + efl_ui_direction_set(box, chk ? EFL_UI_DIR_HORIZONTAL : EFL_UI_DIR_VERTICAL); } static void @@ -221,9 +222,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in elm_win_autodel_set(win, EINA_TRUE); efl_gfx_size_set(win, 600, 400); - vbox = efl_add(EFL_UI_BOX_CLASS, win); + vbox = efl_add(EFL_UI_BOX_CLASS, win, + efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); - efl_orientation_set(vbox, EFL_ORIENT_DOWN); efl_gfx_size_hint_weight_set(vbox, 1, 1); efl_gfx_size_hint_margin_set(vbox, 5, 5, 5, 5); elm_win_resize_object_add(win, vbox); @@ -237,14 +238,15 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in efl_pack(vbox, f); efl_gfx_visible_set(f, 1); - hbox = efl_add(EFL_UI_BOX_CLASS, win); + hbox = efl_add(EFL_UI_BOX_CLASS, win, + efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); elm_object_content_set(f, hbox); efl_pack_padding_set(hbox, 10, 0, EINA_TRUE); /* weights radio group */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); + efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_pack(hbox, bx); @@ -297,7 +299,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* misc */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); + efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_gfx_size_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); @@ -351,7 +353,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* user min size setter */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); + efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_gfx_size_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); @@ -377,7 +379,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* inner box padding */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); + efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_gfx_size_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); @@ -403,7 +405,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* outer margin */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); + efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_gfx_size_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); @@ -429,7 +431,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in /* Box align */ bx = efl_add(EFL_UI_BOX_CLASS, win, - efl_orientation_set(efl_added, EFL_ORIENT_DOWN)); + efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); efl_gfx_size_hint_align_set(bx, 0, -1); efl_gfx_size_hint_weight_set(bx, 1, 1); efl_pack(hbox, bx); @@ -475,7 +477,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in efl_pack(vbox, f); efl_gfx_visible_set(f, 1); - bx = efl_add(EFL_UI_BOX_CLASS, win); + bx = efl_add(EFL_UI_BOX_CLASS, win, + efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); efl_key_wref_set(win, "box", bx); efl_pack_padding_set(bx, 10, 10, EINA_TRUE); efl_gfx_size_hint_align_set(bx, 0.5, 0.5); diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c index c9d91a60b6..a293566ea1 100644 --- a/src/bin/elementary/test_ui_grid.c +++ b/src/bin/elementary/test_ui_grid.c @@ -177,9 +177,9 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i elm_win_autodel_set(win, EINA_TRUE); efl_gfx_size_set(win, 600, 400); - vbox = efl_add(EFL_UI_BOX_CLASS, win); + vbox = efl_add(EFL_UI_BOX_CLASS, win, + efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); - efl_orientation_set(vbox, EFL_ORIENT_DOWN); efl_gfx_size_hint_weight_set(vbox, 1, 1); efl_gfx_size_hint_margin_set(vbox, 5, 5, 5, 5); elm_win_resize_object_add(win, vbox); @@ -197,7 +197,8 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i efl_pack(vbox, f); efl_gfx_visible_set(f, 1); - hbox = efl_add(EFL_UI_BOX_CLASS, win); + hbox = efl_add(EFL_UI_BOX_CLASS, win, + efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); elm_object_content_set(f, hbox); efl_pack_padding_set(hbox, 10, 0, EINA_TRUE); @@ -502,9 +503,9 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, elm_win_autodel_set(win, EINA_TRUE); efl_gfx_size_set(win, 600, 400); - vbox = efl_add(EFL_UI_BOX_CLASS, win); + vbox = efl_add(EFL_UI_BOX_CLASS, win, + efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); - efl_orientation_set(vbox, EFL_ORIENT_DOWN); efl_gfx_size_hint_weight_set(vbox, 1, 1); efl_gfx_size_hint_margin_set(vbox, 5, 5, 5, 5); elm_win_resize_object_add(win, vbox); @@ -523,7 +524,8 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, efl_pack(vbox, f); efl_gfx_visible_set(f, 1); - hbox = efl_add(EFL_UI_BOX_CLASS, win); + hbox = efl_add(EFL_UI_BOX_CLASS, win, + efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); elm_object_content_set(f, hbox); efl_pack_padding_set(hbox, 5, 0, EINA_TRUE); efl_gfx_visible_set(hbox, 1); diff --git a/src/bin/elementary/test_win_inline.c b/src/bin/elementary/test_win_inline.c index 058c4cbc10..c290c87d56 100644 --- a/src/bin/elementary/test_win_inline.c +++ b/src/bin/elementary/test_win_inline.c @@ -225,7 +225,8 @@ test_win_inline(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even elm_win_resize_object_add(win, bg); evas_object_show(bg); - box = efl_add(EFL_UI_BOX_CLASS, win); + box = efl_add(EFL_UI_BOX_CLASS, win, + efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, box); |