summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@free.fr>2019-09-25 10:26:17 -0700
committerCedric Bail <cedric.bail@free.fr>2019-09-25 10:26:17 -0700
commitac6a3bcb44a4385a8c01222e6f2e9b178325b3ad (patch)
tree2e08f4d603e3172af7a0f6c977a7a167d7545fd3
parent105e6568a4974fd86d11291a10cf615a13df43ed (diff)
Updated to fit EFL 1.23 API.
-rw-r--r--src/bin/image_blend_border.c2
-rw-r--r--src/bin/image_blend_border_recolor.c2
-rw-r--r--src/bin/image_blend_solid_border.c2
-rw-r--r--src/bin/image_blend_solid_middle_border.c4
-rw-r--r--src/bin/image_blend_solid_middle_unscaled.c4
-rw-r--r--src/bin/ui.c2
-rw-r--r--src/bin/widgets_list_1.c2
-rw-r--r--src/bin/widgets_list_1_grouped.c2
-rw-r--r--src/bin/widgets_list_2.c2
-rw-r--r--src/bin/widgets_list_2_grouped.c2
-rw-r--r--src/bin/widgets_list_3.c4
-rw-r--r--src/bin/widgets_list_3_grouped.c4
-rw-r--r--src/bin/widgets_list_4.c4
-rw-r--r--src/bin/widgets_list_4_grouped.c4
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)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_simple_load(o, build_path("bar.png"), NULL); 28 efl_file_simple_load(o, build_path("bar.png"), NULL);
29 efl_gfx_image_border_set(o, 6, 6, 6, 6); 29 efl_gfx_image_border_insets_set(o, 6, 6, 6, 6);
30 efl_gfx_entity_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
32 done = 0; 32 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)
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_simple_load(o, build_path("pan.png"), NULL); 28 efl_file_simple_load(o, build_path("pan.png"), NULL);
29 efl_gfx_color_set(o, 64, 64, 64, 255); 29 efl_gfx_color_set(o, 64, 64, 64, 255);
30 efl_gfx_image_border_set(o, 3, 3, 3, 3); 30 efl_gfx_image_border_insets_set(o, 3, 3, 3, 3);
31 efl_gfx_entity_visible_set(o, EINA_TRUE); 31 efl_gfx_entity_visible_set(o, EINA_TRUE);
32 } 32 }
33 done = 0; 33 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)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_simple_load(o, build_path("frame.png"), NULL); 28 efl_file_simple_load(o, build_path("frame.png"), NULL);
29 efl_gfx_image_border_set(o, 8, 8, 8, 8); 29 efl_gfx_image_border_insets_set(o, 8, 8, 8, 8);
30 efl_gfx_entity_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
32 done = 0; 32 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)
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_simple_load(o, build_path("bar.png"), NULL); 28 efl_file_simple_load(o, build_path("bar.png"), NULL);
29 efl_gfx_image_border_set(o, 6, 6, 6, 6); 29 efl_gfx_image_border_insets_set(o, 6, 6, 6, 6);
30 efl_gfx_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID); 30 efl_gfx_image_center_fill_mode_set(o, EFL_GFX_CENTER_FILL_MODE_SOLID);
31 efl_gfx_entity_visible_set(o, EINA_TRUE); 31 efl_gfx_entity_visible_set(o, EINA_TRUE);
32 } 32 }
33 done = 0; 33 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)
28 efl_file_simple_load(o, build_path("logo.png"), NULL); 28 efl_file_simple_load(o, build_path("logo.png"), NULL);
29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
31 efl_gfx_image_border_set(o, 43, 48, 48, 83); 31 efl_gfx_image_border_insets_set(o, 43, 48, 48, 83);
32 efl_gfx_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID); 32 efl_gfx_image_center_fill_mode_set(o, EFL_GFX_CENTER_FILL_MODE_SOLID);
33 efl_gfx_entity_visible_set(o, EINA_TRUE); 33 efl_gfx_entity_visible_set(o, EINA_TRUE);
34 } 34 }
35 done = 0; 35 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)
463 efl_file_simple_load(o, build_path("text_sel.png"), NULL); 463 efl_file_simple_load(o, build_path("text_sel.png"), NULL);
464 efl_gfx_entity_size_set(o, EINA_SIZE2D(96, 32)); 464 efl_gfx_entity_size_set(o, EINA_SIZE2D(96, 32));
465 efl_gfx_fill_set(o, EINA_RECT(0, 0, 96, 32)); 465 efl_gfx_fill_set(o, EINA_RECT(0, 0, 96, 32));
466 efl_gfx_image_border_set(o, 7, 7, 7, 7); 466 efl_gfx_image_border_insets_set(o, 7, 7, 7, 7);
467 o_menu_text_sel = o; 467 o_menu_text_sel = o;
468 468
469 o = evas_object_text_add(evas); 469 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)
64 { 64 {
65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
66 o_images[i] = o; 66 o_images[i] = o;
67 efl_gfx_image_border_set(o, 2, 2, 2, 2); 67 efl_gfx_image_border_insets_set(o, 2, 2, 2, 2);
68 efl_file_simple_load(o, build_path("pan.png"), NULL); 68 efl_file_simple_load(o, build_path("pan.png"), NULL);
69 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); 69 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
70 efl_gfx_entity_visible_set(o, EINA_TRUE); 70 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)
64 { 64 {
65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
66 o_images[i] = o; 66 o_images[i] = o;
67 efl_gfx_image_border_set(o, 2, 2, 2, 2); 67 efl_gfx_image_border_insets_set(o, 2, 2, 2, 2);
68 efl_file_simple_load(o, build_path("pan.png"), NULL); 68 efl_file_simple_load(o, build_path("pan.png"), NULL);
69 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); 69 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
70 efl_gfx_entity_visible_set(o, EINA_TRUE); 70 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)
64 { 64 {
65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
66 o_images[i] = o; 66 o_images[i] = o;
67 efl_gfx_image_border_set(o, 2, 2, 2, 2); 67 efl_gfx_image_border_insets_set(o, 2, 2, 2, 2);
68 efl_file_simple_load(o, build_path("pan.png"), NULL); 68 efl_file_simple_load(o, build_path("pan.png"), NULL);
69 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); 69 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
70 efl_gfx_entity_visible_set(o, EINA_TRUE); 70 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)
64 { 64 {
65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
66 o_images[i] = o; 66 o_images[i] = o;
67 efl_gfx_image_border_set(o, 2, 2, 2, 2); 67 efl_gfx_image_border_insets_set(o, 2, 2, 2, 2);
68 efl_file_simple_load(o, build_path("pan.png"), NULL); 68 efl_file_simple_load(o, build_path("pan.png"), NULL);
69 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); 69 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
70 efl_gfx_entity_visible_set(o, EINA_TRUE); 70 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)
85 { 85 {
86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
87 o_images[i] = o; 87 o_images[i] = o;
88 efl_gfx_image_border_set(o, 2, 2, 2, 2); 88 efl_gfx_image_border_insets_set(o, 2, 2, 2, 2);
89 efl_file_simple_load(o, build_path("pan.png"), NULL); 89 efl_file_simple_load(o, build_path("pan.png"), NULL);
90 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); 90 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
91 efl_gfx_entity_visible_set(o, EINA_TRUE); 91 efl_gfx_entity_visible_set(o, EINA_TRUE);
92 92
93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
94 o_icons[i] = o; 94 o_icons[i] = o;
95 efl_gfx_image_border_set(o, 2, 2, 2, 2); 95 efl_gfx_image_border_insets_set(o, 2, 2, 2, 2);
96 efl_file_simple_load(o, build_path(icons[i % 13]), NULL); 96 efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
97 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8)); 97 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8));
98 efl_gfx_entity_visible_set(o, EINA_TRUE); 98 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)
85 { 85 {
86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
87 o_images[i] = o; 87 o_images[i] = o;
88 efl_gfx_image_border_set(o, 2, 2, 2, 2); 88 efl_gfx_image_border_insets_set(o, 2, 2, 2, 2);
89 efl_file_simple_load(o, build_path("pan.png"), NULL); 89 efl_file_simple_load(o, build_path("pan.png"), NULL);
90 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); 90 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
91 efl_gfx_entity_visible_set(o, EINA_TRUE); 91 efl_gfx_entity_visible_set(o, EINA_TRUE);
92 92
93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
94 o_icons[i] = o; 94 o_icons[i] = o;
95 efl_gfx_image_border_set(o, 2, 2, 2, 2); 95 efl_gfx_image_border_insets_set(o, 2, 2, 2, 2);
96 efl_file_simple_load(o, build_path(icons[i % 13]), NULL); 96 efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
97 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8)); 97 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8));
98 efl_gfx_entity_visible_set(o, EINA_TRUE); 98 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)
85 { 85 {
86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
87 o_images[i] = o; 87 o_images[i] = o;
88 efl_gfx_image_border_set(o, 2, 2, 2, 2); 88 efl_gfx_image_border_insets_set(o, 2, 2, 2, 2);
89 efl_file_simple_load(o, build_path("pan.png"), NULL); 89 efl_file_simple_load(o, build_path("pan.png"), NULL);
90 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); 90 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
91 efl_gfx_entity_visible_set(o, EINA_TRUE); 91 efl_gfx_entity_visible_set(o, EINA_TRUE);
92 92
93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
94 o_icons[i] = o; 94 o_icons[i] = o;
95 efl_gfx_image_border_set(o, 2, 2, 2, 2); 95 efl_gfx_image_border_insets_set(o, 2, 2, 2, 2);
96 efl_file_simple_load(o, build_path(icons[i % 13]), NULL); 96 efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
97 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8)); 97 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8));
98 efl_gfx_entity_visible_set(o, EINA_TRUE); 98 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)
85 { 85 {
86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
87 o_images[i] = o; 87 o_images[i] = o;
88 efl_gfx_image_border_set(o, 2, 2, 2, 2); 88 efl_gfx_image_border_insets_set(o, 2, 2, 2, 2);
89 efl_file_simple_load(o, build_path("pan.png"), NULL); 89 efl_file_simple_load(o, build_path("pan.png"), NULL);
90 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); 90 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
91 efl_gfx_entity_visible_set(o, EINA_TRUE); 91 efl_gfx_entity_visible_set(o, EINA_TRUE);
92 92
93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
94 o_icons[i] = o; 94 o_icons[i] = o;
95 efl_gfx_image_border_set(o, 2, 2, 2, 2); 95 efl_gfx_image_border_insets_set(o, 2, 2, 2, 2);
96 efl_file_simple_load(o, build_path(icons[i % 13]), NULL); 96 efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
97 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8)); 97 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8));
98 efl_gfx_entity_visible_set(o, EINA_TRUE); 98 efl_gfx_entity_visible_set(o, EINA_TRUE);