From d28510a37bcf993466644d0f0a4d94c9fe949a29 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Wed, 23 Aug 2017 13:30:33 +0900 Subject: [PATCH] test: Fix EO API usage (direction) --- src/bin/elementary/test_gfx_filters.c | 3 +-- src/bin/elementary/test_ui_grid.c | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c index bc54e11..a3b4d2e 100644 --- a/src/bin/elementary/test_gfx_filters.c +++ b/src/bin/elementary/test_gfx_filters.c @@ -431,11 +431,10 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve elm_colorselector_palette_color_add(o, colors[k].r, colors[k].g, colors[k].b, colors[k].a); } - /* FIXME: No panes in EO APIs. */ o = split = efl_add(EFL_UI_PANES_CLASS, win, efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0), efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0), - efl_orientation_set(efl_added, EFL_ORIENT_HORIZONTAL)); + efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); efl_pack(box, split); { diff --git a/src/bin/elementary/test_ui_grid.c b/src/bin/elementary/test_ui_grid.c index 1a84b40..0cd6837 100644 --- a/src/bin/elementary/test_ui_grid.c +++ b/src/bin/elementary/test_ui_grid.c @@ -205,7 +205,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i /* 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); @@ -267,7 +267,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i /* 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.5, -1); efl_gfx_size_hint_weight_set(bx, 0, 1); efl_pack(hbox, bx); @@ -293,7 +293,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i /* 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); @@ -319,7 +319,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i /* 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); @@ -345,7 +345,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i /* button margins */ 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); @@ -371,7 +371,7 @@ test_ui_grid(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i /* ro info */ 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); @@ -551,7 +551,7 @@ test_ui_grid_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, /* ro info */ 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); -- 2.7.4