cedric pushed a commit to branch master. http://git.enlightenment.org/tools/expedite.git/commit/?id=ac6a3bcb44a4385a8c01222e6f2e9b178325b3ad
commit ac6a3bcb44a4385a8c01222e6f2e9b178325b3ad Author: Cedric Bail <[email protected]> Date: Wed Sep 25 10:26:17 2019 -0700 Updated to fit EFL 1.23 API. --- src/bin/image_blend_border.c | 2 +- src/bin/image_blend_border_recolor.c | 2 +- src/bin/image_blend_solid_border.c | 2 +- src/bin/image_blend_solid_middle_border.c | 4 ++-- src/bin/image_blend_solid_middle_unscaled.c | 4 ++-- src/bin/ui.c | 2 +- src/bin/widgets_list_1.c | 2 +- src/bin/widgets_list_1_grouped.c | 2 +- src/bin/widgets_list_2.c | 2 +- src/bin/widgets_list_2_grouped.c | 2 +- src/bin/widgets_list_3.c | 4 ++-- src/bin/widgets_list_3_grouped.c | 4 ++-- src/bin/widgets_list_4.c | 4 ++-- src/bin/widgets_list_4_grouped.c | 4 ++-- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c index 188bfe7..4acad32 100644 --- a/src/bin/image_blend_border.c +++ b/src/bin/image_blend_border.c @@ -26,7 +26,7 @@ static void _setup(void) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_simple_load(o, build_path("bar.png"), NULL); - efl_gfx_image_border_set(o, 6, 6, 6, 6); + efl_gfx_image_border_insets_set(o, 6, 6, 6, 6); efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c index 4de2697..5d46f2b 100644 --- a/src/bin/image_blend_border_recolor.c +++ b/src/bin/image_blend_border_recolor.c @@ -27,7 +27,7 @@ static void _setup(void) o_images[i] = o; efl_file_simple_load(o, build_path("pan.png"), NULL); efl_gfx_color_set(o, 64, 64, 64, 255); - efl_gfx_image_border_set(o, 3, 3, 3, 3); + efl_gfx_image_border_insets_set(o, 3, 3, 3, 3); efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c index b72d7b7..b4d972d 100644 --- a/src/bin/image_blend_solid_border.c +++ b/src/bin/image_blend_solid_border.c @@ -26,7 +26,7 @@ static void _setup(void) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_simple_load(o, build_path("frame.png"), NULL); - efl_gfx_image_border_set(o, 8, 8, 8, 8); + efl_gfx_image_border_insets_set(o, 8, 8, 8, 8); efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c index 95e22c8..329fc13 100644 --- a/src/bin/image_blend_solid_middle_border.c +++ b/src/bin/image_blend_solid_middle_border.c @@ -26,8 +26,8 @@ static void _setup(void) o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; efl_file_simple_load(o, build_path("bar.png"), NULL); - efl_gfx_image_border_set(o, 6, 6, 6, 6); - efl_gfx_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID); + efl_gfx_image_border_insets_set(o, 6, 6, 6, 6); + efl_gfx_image_center_fill_mode_set(o, EFL_GFX_CENTER_FILL_MODE_SOLID); efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c index 5a3fdc0..67b50d3 100644 --- a/src/bin/image_blend_solid_middle_unscaled.c +++ b/src/bin/image_blend_solid_middle_unscaled.c @@ -28,8 +28,8 @@ static void _setup(void) efl_file_simple_load(o, build_path("logo.png"), NULL); efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); - efl_gfx_image_border_set(o, 43, 48, 48, 83); - efl_gfx_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID); + efl_gfx_image_border_insets_set(o, 43, 48, 48, 83); + efl_gfx_image_center_fill_mode_set(o, EFL_GFX_CENTER_FILL_MODE_SOLID); efl_gfx_entity_visible_set(o, EINA_TRUE); } done = 0; diff --git a/src/bin/ui.c b/src/bin/ui.c index adaba18..f7292d1 100644 --- a/src/bin/ui.c +++ b/src/bin/ui.c @@ -463,7 +463,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) efl_file_simple_load(o, build_path("text_sel.png"), NULL); efl_gfx_entity_size_set(o, EINA_SIZE2D(96, 32)); efl_gfx_fill_set(o, EINA_RECT(0, 0, 96, 32)); - efl_gfx_image_border_set(o, 7, 7, 7, 7); + efl_gfx_image_border_insets_set(o, 7, 7, 7, 7); o_menu_text_sel = o; o = evas_object_text_add(evas); diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c index 01f0869..c30847e 100644 --- a/src/bin/widgets_list_1.c +++ b/src/bin/widgets_list_1.c @@ -64,7 +64,7 @@ static void _setup(void) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_gfx_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_insets_set(o, 2, 2, 2, 2); efl_file_simple_load(o, build_path("pan.png"), NULL); efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); efl_gfx_entity_visible_set(o, EINA_TRUE); diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c index 0b62bee..34bf7cb 100644 --- a/src/bin/widgets_list_1_grouped.c +++ b/src/bin/widgets_list_1_grouped.c @@ -64,7 +64,7 @@ static void _setup(void) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_gfx_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_insets_set(o, 2, 2, 2, 2); efl_file_simple_load(o, build_path("pan.png"), NULL); efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); efl_gfx_entity_visible_set(o, EINA_TRUE); diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c index 01e04e8..c052d3c 100644 --- a/src/bin/widgets_list_2.c +++ b/src/bin/widgets_list_2.c @@ -64,7 +64,7 @@ static void _setup(void) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_gfx_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_insets_set(o, 2, 2, 2, 2); efl_file_simple_load(o, build_path("pan.png"), NULL); efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); efl_gfx_entity_visible_set(o, EINA_TRUE); diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c index fda638a..6b23ce0 100644 --- a/src/bin/widgets_list_2_grouped.c +++ b/src/bin/widgets_list_2_grouped.c @@ -64,7 +64,7 @@ static void _setup(void) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_gfx_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_insets_set(o, 2, 2, 2, 2); efl_file_simple_load(o, build_path("pan.png"), NULL); efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); efl_gfx_entity_visible_set(o, EINA_TRUE); diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c index 9fe60a0..64fc4e3 100644 --- a/src/bin/widgets_list_3.c +++ b/src/bin/widgets_list_3.c @@ -85,14 +85,14 @@ static void _setup(void) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_gfx_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_insets_set(o, 2, 2, 2, 2); efl_file_simple_load(o, build_path("pan.png"), NULL); efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); efl_gfx_entity_visible_set(o, EINA_TRUE); o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_icons[i] = o; - efl_gfx_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_insets_set(o, 2, 2, 2, 2); efl_file_simple_load(o, build_path(icons[i % 13]), NULL); efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8)); efl_gfx_entity_visible_set(o, EINA_TRUE); diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c index 76c7109..cc46a4a 100644 --- a/src/bin/widgets_list_3_grouped.c +++ b/src/bin/widgets_list_3_grouped.c @@ -85,14 +85,14 @@ static void _setup(void) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_gfx_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_insets_set(o, 2, 2, 2, 2); efl_file_simple_load(o, build_path("pan.png"), NULL); efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); efl_gfx_entity_visible_set(o, EINA_TRUE); o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_icons[i] = o; - efl_gfx_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_insets_set(o, 2, 2, 2, 2); efl_file_simple_load(o, build_path(icons[i % 13]), NULL); efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8)); efl_gfx_entity_visible_set(o, EINA_TRUE); diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c index 8488874..b75e982 100644 --- a/src/bin/widgets_list_4.c +++ b/src/bin/widgets_list_4.c @@ -85,14 +85,14 @@ static void _setup(void) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_gfx_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_insets_set(o, 2, 2, 2, 2); efl_file_simple_load(o, build_path("pan.png"), NULL); efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); efl_gfx_entity_visible_set(o, EINA_TRUE); o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_icons[i] = o; - efl_gfx_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_insets_set(o, 2, 2, 2, 2); efl_file_simple_load(o, build_path(icons[i % 13]), NULL); efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8)); efl_gfx_entity_visible_set(o, EINA_TRUE); diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c index 66a3097..36675a2 100644 --- a/src/bin/widgets_list_4_grouped.c +++ b/src/bin/widgets_list_4_grouped.c @@ -85,14 +85,14 @@ static void _setup(void) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_images[i] = o; - efl_gfx_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_insets_set(o, 2, 2, 2, 2); efl_file_simple_load(o, build_path("pan.png"), NULL); efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); efl_gfx_entity_visible_set(o, EINA_TRUE); o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); o_icons[i] = o; - efl_gfx_image_border_set(o, 2, 2, 2, 2); + efl_gfx_image_border_insets_set(o, 2, 2, 2, 2); efl_file_simple_load(o, build_path(icons[i % 13]), NULL); efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8)); efl_gfx_entity_visible_set(o, EINA_TRUE); --
