summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2019-09-16 11:06:02 +0200
committerXavi Artigas <xavierartigas@yahoo.es>2019-09-16 11:06:02 +0200
commit944d5f37c7add5772a62d0d976db48b3a2a90982 (patch)
treefb50f8b08247c02c1b0f2f5c0f03e1125ba35233
parente18d07b2979e5b80ce930fa6f525b9e02f19db01 (diff)
efl/image: Efl.Gfx.Image_Scale_Type -> Efl.Gfx.Image_Scale_Method
ref T7927, T7875 Depends on D9931
-rw-r--r--src/bin/elementary/test_bg.c18
-rw-r--r--src/bin/elementary/test_efl_gfx_mapping.c2
-rw-r--r--src/bin/elementary/test_evas_map.c2
-rw-r--r--src/bin/elementary/test_image.c20
-rw-r--r--src/bin/elementary/test_part_bg.c6
-rw-r--r--src/bin/elementary/test_ui_image.c20
-rw-r--r--src/examples/elementary/bg_cxx_example_02.cc2
-rw-r--r--src/examples/elementary/efl_ui_list_example_1.c4
-rw-r--r--src/examples/elementary/icon_cxx_example_01.cc2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_image.eo7
-rw-r--r--src/lib/elementary/efl_ui_bg.c42
-rw-r--r--src/lib/elementary/efl_ui_bg.eo2
-rw-r--r--src/lib/elementary/efl_ui_image.c34
-rw-r--r--src/lib/elementary/efl_ui_image.eo2
-rw-r--r--src/lib/elementary/efl_ui_widget.c10
-rw-r--r--src/lib/elementary/efl_ui_widget_image.h2
-rw-r--r--src/lib/elementary/efl_ui_widget_part_bg.eo2
-rw-r--r--src/lib/elementary/efl_ui_win.c2
18 files changed, 90 insertions, 89 deletions
diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c
index 45afcac..29fdeec 100644
--- a/src/bin/elementary/test_bg.c
+++ b/src/bin/elementary/test_bg.c
@@ -318,7 +318,7 @@ _image_cb(void *data, const Efl_Event *ev)
318 { 318 {
319 efl_file_simple_get(ev->object, &f, &k); 319 efl_file_simple_get(ev->object, &f, &k);
320 o = efl_add(EFL_UI_IMAGE_CLASS, win, 320 o = efl_add(EFL_UI_IMAGE_CLASS, win,
321 efl_gfx_image_scale_type_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_EXPAND), 321 efl_gfx_image_scale_method_set(efl_added, EFL_GFX_IMAGE_SCALE_METHOD_EXPAND),
322 efl_file_set(efl_added, f), 322 efl_file_set(efl_added, f),
323 efl_file_key_set(efl_added, k) 323 efl_file_key_set(efl_added, k)
324 ); 324 );
@@ -380,7 +380,7 @@ _cb_radio_changed_scale_type(void *data, const Efl_Event *ev)
380 int v = efl_ui_radio_group_selected_value_get(bx); 380 int v = efl_ui_radio_group_selected_value_get(bx);
381 if (v == -1) v = 0; 381 if (v == -1) v = 0;
382 382
383 efl_gfx_image_scale_type_set(o_bg, v); 383 efl_gfx_image_scale_method_set(o_bg, v);
384} 384}
385 385
386static void 386static void
@@ -437,48 +437,48 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
437 efl_pack(box, efl_added)); 437 efl_pack(box, efl_added));
438 438
439 rd = efl_add(EFL_UI_RADIO_CLASS, hbox); 439 rd = efl_add(EFL_UI_RADIO_CLASS, hbox);
440 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_FILL); 440 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_METHOD_FILL);
441 efl_text_set(rd, "Fill"); 441 efl_text_set(rd, "Fill");
442 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0); 442 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0);
443 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg); 443 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg);
444 efl_pack(hbox, rd); 444 efl_pack(hbox, rd);
445 445
446 rd = efl_add(EFL_UI_RADIO_CLASS, hbox); 446 rd = efl_add(EFL_UI_RADIO_CLASS, hbox);
447 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_FIT); 447 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_METHOD_FIT);
448 efl_text_set(rd, "Fit"); 448 efl_text_set(rd, "Fit");
449 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0); 449 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0);
450 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg); 450 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg);
451 efl_pack(hbox, rd); 451 efl_pack(hbox, rd);
452 452
453 rd = efl_add(EFL_UI_RADIO_CLASS, hbox); 453 rd = efl_add(EFL_UI_RADIO_CLASS, hbox);
454 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_FIT_WIDTH); 454 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_METHOD_FIT_WIDTH);
455 efl_text_set(rd, "Fit Horizontally"); 455 efl_text_set(rd, "Fit Horizontally");
456 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0); 456 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0);
457 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg); 457 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg);
458 efl_pack(hbox, rd); 458 efl_pack(hbox, rd);
459 459
460 rd = efl_add(EFL_UI_RADIO_CLASS, hbox); 460 rd = efl_add(EFL_UI_RADIO_CLASS, hbox);
461 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_FIT_HEIGHT); 461 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_METHOD_FIT_HEIGHT);
462 efl_text_set(rd, "Fit Verically"); 462 efl_text_set(rd, "Fit Verically");
463 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0); 463 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0);
464 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg); 464 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg);
465 efl_pack(hbox, rd); 465 efl_pack(hbox, rd);
466 466
467 rd = efl_add(EFL_UI_RADIO_CLASS, hbox); 467 rd = efl_add(EFL_UI_RADIO_CLASS, hbox);
468 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_EXPAND); 468 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_METHOD_EXPAND);
469 efl_text_set(rd, "Expand"); 469 efl_text_set(rd, "Expand");
470 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0); 470 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0);
471 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg); 471 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg);
472 efl_pack(hbox, rd); 472 efl_pack(hbox, rd);
473 473
474 rd = efl_add(EFL_UI_RADIO_CLASS, hbox); 474 rd = efl_add(EFL_UI_RADIO_CLASS, hbox);
475 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_TILE); 475 efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_METHOD_TILE);
476 efl_text_set(rd, "Tile"); 476 efl_text_set(rd, "Tile");
477 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0); 477 efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0);
478 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg); 478 efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg);
479 efl_pack(hbox, rd); 479 efl_pack(hbox, rd);
480 480
481 efl_ui_radio_group_selected_value_set(hbox, EFL_GFX_IMAGE_SCALE_TYPE_FILL); 481 efl_ui_radio_group_selected_value_set(hbox, EFL_GFX_IMAGE_SCALE_METHOD_FILL);
482 482
483 c = efl_add(EFL_UI_CHECK_CLASS, box); 483 c = efl_add(EFL_UI_CHECK_CLASS, box);
484 efl_text_set(c, "Bg Color"); 484 efl_text_set(c, "Bg Color");
diff --git a/src/bin/elementary/test_efl_gfx_mapping.c b/src/bin/elementary/test_efl_gfx_mapping.c
index c4080c1..fecfc45 100644
--- a/src/bin/elementary/test_efl_gfx_mapping.c
+++ b/src/bin/elementary/test_efl_gfx_mapping.c
@@ -55,7 +55,7 @@ test_efl_gfx_mapping(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
55 img = efl_add(EFL_UI_IMAGE_CLASS, win, 55 img = efl_add(EFL_UI_IMAGE_CLASS, win,
56 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), 56 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)),
57 efl_file_set(efl_added, buf)); 57 efl_file_set(efl_added, buf));
58 efl_gfx_image_scale_type_set(img, EFL_GFX_IMAGE_SCALE_TYPE_FILL); 58 efl_gfx_image_scale_method_set(img, EFL_GFX_IMAGE_SCALE_METHOD_FILL);
59 evas_object_event_callback_add(img, EVAS_CALLBACK_RESIZE, 59 evas_object_event_callback_add(img, EVAS_CALLBACK_RESIZE,
60 _image_resize_cb, NULL); 60 _image_resize_cb, NULL);
61 61
diff --git a/src/bin/elementary/test_evas_map.c b/src/bin/elementary/test_evas_map.c
index 3cabe96..0687a33 100644
--- a/src/bin/elementary/test_evas_map.c
+++ b/src/bin/elementary/test_evas_map.c
@@ -64,7 +64,7 @@ test_evas_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
64 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), 64 efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)),
65 efl_file_set(efl_added, buf), 65 efl_file_set(efl_added, buf),
66 efl_file_load(efl_added)); 66 efl_file_load(efl_added));
67 efl_gfx_image_scale_type_set(img, EFL_GFX_IMAGE_SCALE_TYPE_FILL); 67 efl_gfx_image_scale_method_set(img, EFL_GFX_IMAGE_SCALE_METHOD_FILL);
68 evas_object_event_callback_add(img, EVAS_CALLBACK_RESIZE, 68 evas_object_event_callback_add(img, EVAS_CALLBACK_RESIZE,
69 _image_resize_cb, NULL); 69 _image_resize_cb, NULL);
70 70
diff --git a/src/bin/elementary/test_image.c b/src/bin/elementary/test_image.c
index cbc127e..38304cc 100644
--- a/src/bin/elementary/test_image.c
+++ b/src/bin/elementary/test_image.c
@@ -100,16 +100,16 @@ im_align_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUS
100} 100}
101 101
102static const struct { 102static const struct {
103 Efl_Gfx_Image_Scale_Type scale_type; 103 Efl_Gfx_Image_Scale_Method scale_type;
104 const char *name; 104 const char *name;
105} images_scale_type[] = { 105} images_scale_type[] = {
106 { EFL_GFX_IMAGE_SCALE_TYPE_NONE, "None" }, 106 { EFL_GFX_IMAGE_SCALE_METHOD_NONE, "None" },
107 { EFL_GFX_IMAGE_SCALE_TYPE_FILL, "Fill" }, 107 { EFL_GFX_IMAGE_SCALE_METHOD_FILL, "Fill" },
108 { EFL_GFX_IMAGE_SCALE_TYPE_FIT, "Fit" }, 108 { EFL_GFX_IMAGE_SCALE_METHOD_FIT, "Fit" },
109 { EFL_GFX_IMAGE_SCALE_TYPE_FIT_WIDTH, "Fit Horizontally" }, 109 { EFL_GFX_IMAGE_SCALE_METHOD_FIT_WIDTH, "Fit Horizontally" },
110 { EFL_GFX_IMAGE_SCALE_TYPE_FIT_HEIGHT, "Fit Vertically" }, 110 { EFL_GFX_IMAGE_SCALE_METHOD_FIT_HEIGHT, "Fit Vertically" },
111 { EFL_GFX_IMAGE_SCALE_TYPE_EXPAND, "Expand" }, 111 { EFL_GFX_IMAGE_SCALE_METHOD_EXPAND, "Expand" },
112 { EFL_GFX_IMAGE_SCALE_TYPE_TILE, "Tile" }, 112 { EFL_GFX_IMAGE_SCALE_METHOD_TILE, "Tile" },
113 { 0, NULL } 113 { 0, NULL }
114}; 114};
115 115
@@ -121,9 +121,9 @@ my_im_scale_ch(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_U
121 Evas_Object *rdg = evas_object_data_get(win, "rdg"); 121 Evas_Object *rdg = evas_object_data_get(win, "rdg");
122 int v = elm_radio_value_get(rdg); 122 int v = elm_radio_value_get(rdg);
123 123
124 efl_gfx_image_scale_type_set(im, images_scale_type[v].scale_type); 124 efl_gfx_image_scale_method_set(im, images_scale_type[v].scale_type);
125 fprintf(stderr, "Set %d[%s] and got %d\n", 125 fprintf(stderr, "Set %d[%s] and got %d\n",
126 images_scale_type[v].scale_type, images_scale_type[v].name, efl_gfx_image_scale_type_get(im)); 126 images_scale_type[v].scale_type, images_scale_type[v].name, efl_gfx_image_scale_method_get(im));
127} 127}
128 128
129void 129void
diff --git a/src/bin/elementary/test_part_bg.c b/src/bin/elementary/test_part_bg.c
index 3f8f30b..da50aae 100644
--- a/src/bin/elementary/test_part_bg.c
+++ b/src/bin/elementary/test_part_bg.c
@@ -40,7 +40,7 @@ _scale_type_cb(void *data, const Efl_Event *ev EINA_UNUSED)
40{ 40{
41 Efl_Ui_Radio_Group *radio = data; 41 Efl_Ui_Radio_Group *radio = data;
42 Evas_Object *target; 42 Evas_Object *target;
43 Efl_Gfx_Image_Scale_Type type; 43 Efl_Gfx_Image_Scale_Method type;
44 char buf[PATH_MAX]; 44 char buf[PATH_MAX];
45 45
46 radio = efl_ui_single_selectable_last_selected_get(radio); 46 radio = efl_ui_single_selectable_last_selected_get(radio);
@@ -48,9 +48,9 @@ _scale_type_cb(void *data, const Efl_Event *ev EINA_UNUSED)
48 48
49 snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); 49 snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get());
50 efl_file_simple_load(efl_part(target, "background"), buf, NULL); 50 efl_file_simple_load(efl_part(target, "background"), buf, NULL);
51 type = efl_gfx_image_scale_type_get(efl_part(target, "background")); 51 type = efl_gfx_image_scale_method_get(efl_part(target, "background"));
52 type = (type + 1) % 6; 52 type = (type + 1) % 6;
53 efl_gfx_image_scale_type_set(efl_part(target, "background"), type); 53 efl_gfx_image_scale_method_set(efl_part(target, "background"), type);
54} 54}
55 55
56static Efl_Ui_Radio_Group * 56static Efl_Ui_Radio_Group *
diff --git a/src/bin/elementary/test_ui_image.c b/src/bin/elementary/test_ui_image.c
index 87ad9fb..c93fd4c 100644
--- a/src/bin/elementary/test_ui_image.c
+++ b/src/bin/elementary/test_ui_image.c
@@ -107,16 +107,16 @@ im_align_cb(void *data, Eo *obj EINA_UNUSED, void *event_info EINA_UNUSED)
107} 107}
108 108
109static const struct { 109static const struct {
110 Efl_Gfx_Image_Scale_Type scale_type; 110 Efl_Gfx_Image_Scale_Method scale_type;
111 const char *name; 111 const char *name;
112} images_scale_type[] = { 112} images_scale_type[] = {
113 { EFL_GFX_IMAGE_SCALE_TYPE_NONE, "None" }, 113 { EFL_GFX_IMAGE_SCALE_METHOD_NONE, "None" },
114 { EFL_GFX_IMAGE_SCALE_TYPE_FILL, "Fill" }, 114 { EFL_GFX_IMAGE_SCALE_METHOD_FILL, "Fill" },
115 { EFL_GFX_IMAGE_SCALE_TYPE_FIT, "Fit" }, 115 { EFL_GFX_IMAGE_SCALE_METHOD_FIT, "Fit" },
116 { EFL_GFX_IMAGE_SCALE_TYPE_FIT_WIDTH, "Fit Horizontally" }, 116 { EFL_GFX_IMAGE_SCALE_METHOD_FIT_WIDTH, "Fit Horizontally" },
117 { EFL_GFX_IMAGE_SCALE_TYPE_FIT_HEIGHT, "Fit Vertically" }, 117 { EFL_GFX_IMAGE_SCALE_METHOD_FIT_HEIGHT, "Fit Vertically" },
118 { EFL_GFX_IMAGE_SCALE_TYPE_EXPAND, "Expand" }, 118 { EFL_GFX_IMAGE_SCALE_METHOD_EXPAND, "Expand" },
119 { EFL_GFX_IMAGE_SCALE_TYPE_TILE, "Tile" }, 119 { EFL_GFX_IMAGE_SCALE_METHOD_TILE, "Tile" },
120 { 0, NULL } 120 { 0, NULL }
121}; 121};
122 122
@@ -128,9 +128,9 @@ my_im_scale_ch(void *data, const Efl_Event *ev EINA_UNUSED)
128 int v = efl_ui_radio_group_selected_value_get(ev->object); 128 int v = efl_ui_radio_group_selected_value_get(ev->object);
129 if (v == -1) v = 0; 129 if (v == -1) v = 0;
130 130
131 efl_gfx_image_scale_type_set(im, images_scale_type[v].scale_type); 131 efl_gfx_image_scale_method_set(im, images_scale_type[v].scale_type);
132 fprintf(stderr, "Set %d[%s] and got %d\n", 132 fprintf(stderr, "Set %d[%s] and got %d\n",
133 images_scale_type[v].scale_type, images_scale_type[v].name, efl_gfx_image_scale_type_get(im)); 133 images_scale_type[v].scale_type, images_scale_type[v].name, efl_gfx_image_scale_method_get(im));
134} 134}
135 135
136void 136void
diff --git a/src/examples/elementary/bg_cxx_example_02.cc b/src/examples/elementary/bg_cxx_example_02.cc
index 4969819..f276fdd 100644
--- a/src/examples/elementary/bg_cxx_example_02.cc
+++ b/src/examples/elementary/bg_cxx_example_02.cc
@@ -33,7 +33,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
33 path = "performance/background.png"; 33 path = "performance/background.png";
34 34
35 efl::ui::Bg bg(instantiate, win); 35 efl::ui::Bg bg(instantiate, win);
36 bg.scale_type_set(EFL_GFX_IMAGE_SCALE_TYPE_FILL); 36 bg.scale_method_set(EFL_GFX_IMAGE_SCALE_METHOD_FILL);
37 bg.file_set(path); 37 bg.file_set(path);
38 bg.load(); 38 bg.load();
39 win.content_set(bg); 39 win.content_set(bg);
diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c
index 5cadb29..5a30a8c 100644
--- a/src/examples/elementary/efl_ui_list_example_1.c
+++ b/src/examples/elementary/efl_ui_list_example_1.c
@@ -200,13 +200,13 @@ elm_main(int argc EINA_UNUSED, char **argv)
200 200
201 case 40: 201 case 40:
202 efl_file_simple_load(efl_part(item, "background"), "./sky_01.jpg", NULL); 202 efl_file_simple_load(efl_part(item, "background"), "./sky_01.jpg", NULL);
203 efl_gfx_image_scale_type_set(efl_part(item, "background"), EFL_GFX_IMAGE_SCALE_TYPE_EXPAND); 203 efl_gfx_image_scale_method_set(efl_part(item, "background"), EFL_GFX_IMAGE_SCALE_METHOD_EXPAND);
204 efl_pack_at(list, item, 39); 204 efl_pack_at(list, item, 39);
205 break; 205 break;
206 206
207 case 50: 207 case 50:
208 efl_file_simple_load(efl_part(item, "background"), "./sky_01.jpg", NULL); 208 efl_file_simple_load(efl_part(item, "background"), "./sky_01.jpg", NULL);
209 efl_gfx_image_scale_type_set(efl_part(item, "background"), EFL_GFX_IMAGE_SCALE_TYPE_TILE); 209 efl_gfx_image_scale_method_set(efl_part(item, "background"), EFL_GFX_IMAGE_SCALE_METHOD_TILE);
210 efl_pack(list, item); 210 efl_pack(list, item);
211 break; 211 break;
212 212
diff --git a/src/examples/elementary/icon_cxx_example_01.cc b/src/examples/elementary/icon_cxx_example_01.cc
index fd71bed..90271c1 100644
--- a/src/examples/elementary/icon_cxx_example_01.cc
+++ b/src/examples/elementary/icon_cxx_example_01.cc
@@ -20,7 +20,7 @@ elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED)
20 20
21 std::cout << ", name = " << icon.icon_get() << std::endl; 21 std::cout << ", name = " << icon.icon_get() << std::endl;
22 22
23 icon.scale_type_set(EFL_GFX_IMAGE_SCALE_TYPE_NONE); 23 icon.scale_method_set(EFL_GFX_IMAGE_SCALE_METHOD_NONE);
24 //icon.resizable_set(false, true); 24 //icon.resizable_set(false, true);
25 //icon.smooth_set(false); 25 //icon.smooth_set(false);
26 //icon.fill_outside_set(true); 26 //icon.fill_outside_set(true);
diff --git a/src/lib/efl/interfaces/efl_gfx_image.eo b/src/lib/efl/interfaces/efl_gfx_image.eo
index c39b4c2..bfaa48e 100644
--- a/src/lib/efl/interfaces/efl_gfx_image.eo
+++ b/src/lib/efl/interfaces/efl_gfx_image.eo
@@ -18,7 +18,7 @@ enum @beta Efl.Gfx.Image_Scale_Hint
18 static = 2 [[Image will not be re-scaled over time, thus turning scaling cache ON for its data.]] 18 static = 2 [[Image will not be re-scaled over time, thus turning scaling cache ON for its data.]]
19} 19}
20 20
21enum @beta Efl.Gfx.Image_Scale_Type 21enum @beta Efl.Gfx.Image_Scale_Method
22{ 22{
23 [[Enumeration that defines scaling methods to be used when rendering an image.]] 23 [[Enumeration that defines scaling methods to be used when rendering an image.]]
24 none, [[Use the image's natural size.]] 24 none, [[Use the image's natural size.]]
@@ -82,14 +82,15 @@ interface @beta Efl.Gfx.Image
82 smooth_scale: bool; [[Whether to use smooth scale or not. The default value is $true.]] 82 smooth_scale: bool; [[Whether to use smooth scale or not. The default value is $true.]]
83 } 83 }
84 } 84 }
85 @property scale_type { 85 @property scale_method {
86 [[Determine how the image is scaled at render time. 86 [[Determine how the image is scaled at render time.
87 87
88 This allows more granular controls for how an image object should display its internal 88 This allows more granular controls for how an image object should display its internal
89 buffer. The underlying image data will not be modified. 89 buffer. The underlying image data will not be modified.
90 ]] 90 ]]
91 values { 91 values {
92 scale_type: Efl.Gfx.Image_Scale_Type; [[Image scale type to use. The default value is @Efl.Gfx.Image_Scale_Type.none.]] 92 scale_method: Efl.Gfx.Image_Scale_Method; [[Image scale type to use. The default value is
93 @Efl.Gfx.Image_Scale_Method.none.]]
93 } 94 }
94 } 95 }
95 @property can_upscale { 96 @property can_upscale {
diff --git a/src/lib/elementary/efl_ui_bg.c b/src/lib/elementary/efl_ui_bg.c
index acde39f..8759bf4 100644
--- a/src/lib/elementary/efl_ui_bg.c
+++ b/src/lib/elementary/efl_ui_bg.c
@@ -44,7 +44,7 @@ _efl_ui_bg_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Data *pd)
44 efl_content_set(efl_part(obj, "elm.swallow.rectangle"), efl_added)); 44 efl_content_set(efl_part(obj, "elm.swallow.rectangle"), efl_added));
45 45
46 pd->img = elm_image_add(obj); 46 pd->img = elm_image_add(obj);
47 efl_gfx_image_scale_type_set(pd->img, EFL_GFX_IMAGE_SCALE_TYPE_EXPAND); 47 efl_gfx_image_scale_method_set(pd->img, EFL_GFX_IMAGE_SCALE_METHOD_EXPAND);
48 elm_layout_content_set(obj, "elm.swallow.background", pd->img); 48 elm_layout_content_set(obj, "elm.swallow.background", pd->img);
49 } 49 }
50 else 50 else
@@ -54,7 +54,7 @@ _efl_ui_bg_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Data *pd)
54 efl_content_set(efl_part(obj, "efl.rectangle"), efl_added)); 54 efl_content_set(efl_part(obj, "efl.rectangle"), efl_added));
55 55
56 pd->img = efl_add(EFL_UI_IMAGE_CLASS, obj, 56 pd->img = efl_add(EFL_UI_IMAGE_CLASS, obj,
57 efl_gfx_image_scale_type_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_EXPAND), 57 efl_gfx_image_scale_method_set(efl_added, EFL_GFX_IMAGE_SCALE_METHOD_EXPAND),
58 efl_content_set(efl_part(obj, "efl.background"), efl_added)); 58 efl_content_set(efl_part(obj, "efl.background"), efl_added));
59 } 59 }
60 pd->file = NULL; 60 pd->file = NULL;
@@ -79,51 +79,51 @@ _efl_ui_bg_efl_object_destructor(Eo *obj, Efl_Ui_Bg_Data *sd)
79EAPI void 79EAPI void
80elm_bg_option_set(Evas_Object *obj, Elm_Bg_Option option) 80elm_bg_option_set(Evas_Object *obj, Elm_Bg_Option option)
81{ 81{
82 Efl_Gfx_Image_Scale_Type type; 82 Efl_Gfx_Image_Scale_Method type;
83 83
84 switch (option) 84 switch (option)
85 { 85 {
86 case ELM_BG_OPTION_CENTER: 86 case ELM_BG_OPTION_CENTER:
87 type = EFL_GFX_IMAGE_SCALE_TYPE_NONE; 87 type = EFL_GFX_IMAGE_SCALE_METHOD_NONE;
88 break; 88 break;
89 case ELM_BG_OPTION_SCALE: 89 case ELM_BG_OPTION_SCALE:
90 type = EFL_GFX_IMAGE_SCALE_TYPE_EXPAND; 90 type = EFL_GFX_IMAGE_SCALE_METHOD_EXPAND;
91 break; 91 break;
92 case ELM_BG_OPTION_TILE: 92 case ELM_BG_OPTION_TILE:
93 type = EFL_GFX_IMAGE_SCALE_TYPE_TILE; 93 type = EFL_GFX_IMAGE_SCALE_METHOD_TILE;
94 break; 94 break;
95 case ELM_BG_OPTION_STRETCH: 95 case ELM_BG_OPTION_STRETCH:
96 type = EFL_GFX_IMAGE_SCALE_TYPE_FILL; 96 type = EFL_GFX_IMAGE_SCALE_METHOD_FILL;
97 break; 97 break;
98 case ELM_BG_OPTION_LAST: 98 case ELM_BG_OPTION_LAST:
99 default: 99 default:
100 type = EFL_GFX_IMAGE_SCALE_TYPE_EXPAND; 100 type = EFL_GFX_IMAGE_SCALE_METHOD_EXPAND;
101 } 101 }
102 efl_gfx_image_scale_type_set(obj, type); 102 efl_gfx_image_scale_method_set(obj, type);
103} 103}
104 104
105EAPI Elm_Bg_Option 105EAPI Elm_Bg_Option
106elm_bg_option_get(const Evas_Object *obj) 106elm_bg_option_get(const Evas_Object *obj)
107{ 107{
108 Efl_Gfx_Image_Scale_Type type; 108 Efl_Gfx_Image_Scale_Method type;
109 Elm_Bg_Option option = ELM_BG_OPTION_LAST; 109 Elm_Bg_Option option = ELM_BG_OPTION_LAST;
110 110
111 type = efl_gfx_image_scale_type_get(obj); 111 type = efl_gfx_image_scale_method_get(obj);
112 switch (type) 112 switch (type)
113 { 113 {
114 case EFL_GFX_IMAGE_SCALE_TYPE_NONE: 114 case EFL_GFX_IMAGE_SCALE_METHOD_NONE:
115 option = ELM_BG_OPTION_CENTER; 115 option = ELM_BG_OPTION_CENTER;
116 break; 116 break;
117 case EFL_GFX_IMAGE_SCALE_TYPE_EXPAND: 117 case EFL_GFX_IMAGE_SCALE_METHOD_EXPAND:
118 option = ELM_BG_OPTION_SCALE; 118 option = ELM_BG_OPTION_SCALE;
119 break; 119 break;
120 case EFL_GFX_IMAGE_SCALE_TYPE_TILE: 120 case EFL_GFX_IMAGE_SCALE_METHOD_TILE:
121 option = ELM_BG_OPTION_TILE; 121 option = ELM_BG_OPTION_TILE;
122 break; 122 break;
123 case EFL_GFX_IMAGE_SCALE_TYPE_FILL: 123 case EFL_GFX_IMAGE_SCALE_METHOD_FILL:
124 option = ELM_BG_OPTION_STRETCH; 124 option = ELM_BG_OPTION_STRETCH;
125 break; 125 break;
126 case EFL_GFX_IMAGE_SCALE_TYPE_FIT: 126 case EFL_GFX_IMAGE_SCALE_METHOD_FIT:
127 default: 127 default:
128 ERR("Scale type %d cannot be converted to Elm_Bg_Option", type); 128 ERR("Scale type %d cannot be converted to Elm_Bg_Option", type);
129 break; 129 break;
@@ -133,15 +133,15 @@ elm_bg_option_get(const Evas_Object *obj)
133} 133}
134 134
135EOLIAN static void 135EOLIAN static void
136_efl_ui_bg_efl_gfx_image_scale_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Data *sd, Efl_Gfx_Image_Scale_Type scale_type) 136_efl_ui_bg_efl_gfx_image_scale_method_set(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Data *sd, Efl_Gfx_Image_Scale_Method scale_type)
137{ 137{
138 efl_gfx_image_scale_type_set(sd->img, scale_type); 138 efl_gfx_image_scale_method_set(sd->img, scale_type);
139} 139}
140 140
141EOLIAN static Efl_Gfx_Image_Scale_Type 141EOLIAN static Efl_Gfx_Image_Scale_Method
142_efl_ui_bg_efl_gfx_image_scale_type_get(const Eo *obj EINA_UNUSED, Efl_Ui_Bg_Data *sd) 142_efl_ui_bg_efl_gfx_image_scale_method_get(const Eo *obj EINA_UNUSED, Efl_Ui_Bg_Data *sd)
143{ 143{
144 return efl_gfx_image_scale_type_get(sd->img); 144 return efl_gfx_image_scale_method_get(sd->img);
145} 145}
146 146
147EAPI void 147EAPI void
diff --git a/src/lib/elementary/efl_ui_bg.eo b/src/lib/elementary/efl_ui_bg.eo
index f4552e3..5de72ab 100644
--- a/src/lib/elementary/efl_ui_bg.eo
+++ b/src/lib/elementary/efl_ui_bg.eo
@@ -16,7 +16,7 @@ class @beta Efl.Ui.Bg extends Efl.Ui.Layout_Base
16 Efl.File.key { get; set; } 16 Efl.File.key { get; set; }
17 Efl.File.mmap { get; set; } 17 Efl.File.mmap { get; set; }
18 Efl.Gfx.Color.color { get; set; } 18 Efl.Gfx.Color.color { get; set; }
19 Efl.Gfx.Image.scale_type { get; set; } 19 Efl.Gfx.Image.scale_method { get; set; }
20 Efl.Gfx.Image_Load_Controller.load_size { get; set; } 20 Efl.Gfx.Image_Load_Controller.load_size { get; set; }
21 } 21 }
22} 22}
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 8fd829b..a5d683c 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -204,15 +204,15 @@ _image_sizing_eval(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *img)
204 // according to (iw x ih), (ow x oh), and scale_type 204 // according to (iw x ih), (ow x oh), and scale_type
205 switch (sd->scale_type) 205 switch (sd->scale_type)
206 { 206 {
207 case EFL_GFX_IMAGE_SCALE_TYPE_NONE: 207 case EFL_GFX_IMAGE_SCALE_METHOD_NONE:
208 w = iw; 208 w = iw;
209 h = ih; 209 h = ih;
210 break; 210 break;
211 case EFL_GFX_IMAGE_SCALE_TYPE_FILL: 211 case EFL_GFX_IMAGE_SCALE_METHOD_FILL:
212 w = ow; 212 w = ow;
213 h = oh; 213 h = oh;
214 break; 214 break;
215 case EFL_GFX_IMAGE_SCALE_TYPE_FIT: 215 case EFL_GFX_IMAGE_SCALE_METHOD_FIT:
216 w = ow; 216 w = ow;
217 h = ((double)ih * w) / (double)iw; 217 h = ((double)ih * w) / (double)iw;
218 218
@@ -224,17 +224,17 @@ _image_sizing_eval(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *img)
224 224
225 225
226 break; 226 break;
227 case EFL_GFX_IMAGE_SCALE_TYPE_FIT_WIDTH: 227 case EFL_GFX_IMAGE_SCALE_METHOD_FIT_WIDTH:
228 w = ow; 228 w = ow;
229 h = ((double)ih * w) / (double)iw; 229 h = ((double)ih * w) / (double)iw;
230 230
231 break; 231 break;
232 case EFL_GFX_IMAGE_SCALE_TYPE_FIT_HEIGHT: 232 case EFL_GFX_IMAGE_SCALE_METHOD_FIT_HEIGHT:
233 h = oh; 233 h = oh;
234 w = ((double)iw * h) / (double)ih; 234 w = ((double)iw * h) / (double)ih;
235 235
236 break; 236 break;
237 case EFL_GFX_IMAGE_SCALE_TYPE_EXPAND: 237 case EFL_GFX_IMAGE_SCALE_METHOD_EXPAND:
238 if (ow > oh) 238 if (ow > oh)
239 { 239 {
240 w = ow; 240 w = ow;
@@ -246,7 +246,7 @@ _image_sizing_eval(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *img)
246 w = ((double)iw * h) / (double)ih; 246 w = ((double)iw * h) / (double)ih;
247 } 247 }
248 break; 248 break;
249 case EFL_GFX_IMAGE_SCALE_TYPE_TILE: 249 case EFL_GFX_IMAGE_SCALE_METHOD_TILE:
250 evas_object_geometry_get(obj, &x, &y, &w, &h); 250 evas_object_geometry_get(obj, &x, &y, &w, &h);
251 evas_object_image_fill_set(img, x, y, iw, ih); 251 evas_object_image_fill_set(img, x, y, iw, ih);
252 goto done; 252 goto done;
@@ -869,7 +869,7 @@ _efl_ui_image_efl_object_constructor(Eo *obj, Efl_Ui_Image_Data *pd)
869 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 869 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
870 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE); 870 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE);
871 871
872 pd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_FIT; 872 pd->scale_type = EFL_GFX_IMAGE_SCALE_METHOD_FIT;
873 pd->self = obj; 873 pd->self = obj;
874 874
875 return obj; 875 return obj;
@@ -1579,7 +1579,7 @@ _efl_ui_image_efl_player_play_get(const Eo *obj, Efl_Ui_Image_Data *sd)
1579} 1579}
1580 1580
1581EOLIAN static void 1581EOLIAN static void
1582_efl_ui_image_efl_gfx_image_scale_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd EINA_UNUSED, Efl_Gfx_Image_Scale_Type scale_type) 1582_efl_ui_image_efl_gfx_image_scale_method_set(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd EINA_UNUSED, Efl_Gfx_Image_Scale_Method scale_type)
1583{ 1583{
1584 if (scale_type == sd->scale_type) return; 1584 if (scale_type == sd->scale_type) return;
1585 1585
@@ -1588,8 +1588,8 @@ _efl_ui_image_efl_gfx_image_scale_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Image_Dat
1588 efl_canvas_group_change(obj); 1588 efl_canvas_group_change(obj);
1589} 1589}
1590 1590
1591EOLIAN static Efl_Gfx_Image_Scale_Type 1591EOLIAN static Efl_Gfx_Image_Scale_Method
1592_efl_ui_image_efl_gfx_image_scale_type_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd) 1592_efl_ui_image_efl_gfx_image_scale_method_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1593{ 1593{
1594 return sd->scale_type; 1594 return sd->scale_type;
1595} 1595}
@@ -2101,11 +2101,11 @@ elm_image_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside)
2101 2101
2102 if (sd->aspect_fixed) 2102 if (sd->aspect_fixed)
2103 { 2103 {
2104 if (sd->fill_inside) sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_FIT; 2104 if (sd->fill_inside) sd->scale_type = EFL_GFX_IMAGE_SCALE_METHOD_FIT;
2105 else sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_EXPAND; 2105 else sd->scale_type = EFL_GFX_IMAGE_SCALE_METHOD_EXPAND;
2106 } 2106 }
2107 else 2107 else
2108 sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_FILL; 2108 sd->scale_type = EFL_GFX_IMAGE_SCALE_METHOD_FILL;
2109 2109
2110 efl_canvas_group_change(obj); 2110 efl_canvas_group_change(obj);
2111} 2111}
@@ -2246,11 +2246,11 @@ elm_image_aspect_fixed_set(Evas_Object *obj, Eina_Bool fixed)
2246 2246
2247 if (sd->aspect_fixed) 2247 if (sd->aspect_fixed)
2248 { 2248 {
2249 if (sd->fill_inside) sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_FIT; 2249 if (sd->fill_inside) sd->scale_type = EFL_GFX_IMAGE_SCALE_METHOD_FIT;
2250 else sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_EXPAND; 2250 else sd->scale_type = EFL_GFX_IMAGE_SCALE_METHOD_EXPAND;
2251 } 2251 }
2252 else 2252 else
2253 sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_FILL; 2253 sd->scale_type = EFL_GFX_IMAGE_SCALE_METHOD_FILL;
2254 2254
2255 efl_canvas_group_change(obj); 2255 efl_canvas_group_change(obj);
2256} 2256}
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 3abf738..876d817 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -78,7 +78,7 @@ class @beta Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Input.Clickable, E
78 Efl.Gfx.Image.image_size { get; } 78 Efl.Gfx.Image.image_size { get; }
79 Efl.Gfx.Image_Load_Controller.load_size { get; set; } 79 Efl.Gfx.Image_Load_Controller.load_size { get; set; }
80 Efl.Gfx.Image.smooth_scale { get; set; } 80 Efl.Gfx.Image.smooth_scale { get; set; }
81 Efl.Gfx.Image.scale_type { get; set; } 81 Efl.Gfx.Image.scale_method { get; set; }
82 Efl.Gfx.Image_Orientable.image_orientation { get; set; } 82 Efl.Gfx.Image_Orientable.image_orientation { get; set; }
83 Efl.Player.playable { get; } 83 Efl.Player.playable { get; }
84 Efl.Player.play { get; set; } 84 Efl.Player.play { get; set; }
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 9dc21e3..88eae6e 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -5760,19 +5760,19 @@ _efl_ui_widget_part_bg_efl_gfx_color_color_get(const Eo *obj, void *pd EINA_UNUS
5760} 5760}
5761 5761
5762EOLIAN static void 5762EOLIAN static void
5763_efl_ui_widget_part_bg_efl_gfx_image_scale_type_set(Eo *obj, void *pd EINA_UNUSED, Efl_Gfx_Image_Scale_Type scale_type) 5763_efl_ui_widget_part_bg_efl_gfx_image_scale_method_set(Eo *obj, void *pd EINA_UNUSED, Efl_Gfx_Image_Scale_Method scale_type)
5764{ 5764{
5765 Evas_Object *bg_obj = efl_ui_widget_part_bg_get(obj); 5765 Evas_Object *bg_obj = efl_ui_widget_part_bg_get(obj);
5766 5766
5767 efl_gfx_image_scale_type_set(bg_obj, scale_type); 5767 efl_gfx_image_scale_method_set(bg_obj, scale_type);
5768} 5768}
5769 5769
5770EOLIAN static Efl_Gfx_Image_Scale_Type 5770EOLIAN static Efl_Gfx_Image_Scale_Method
5771_efl_ui_widget_part_bg_efl_gfx_image_scale_type_get(const Eo *obj, void *pd EINA_UNUSED) 5771_efl_ui_widget_part_bg_efl_gfx_image_scale_method_get(const Eo *obj, void *pd EINA_UNUSED)
5772{ 5772{
5773 Evas_Object *bg_obj = efl_ui_widget_part_bg_get(obj); 5773 Evas_Object *bg_obj = efl_ui_widget_part_bg_get(obj);
5774 5774
5775 return efl_gfx_image_scale_type_get(bg_obj); 5775 return efl_gfx_image_scale_method_get(bg_obj);
5776} 5776}
5777 5777
5778typedef struct _Efl_Ui_Property_Bound Efl_Ui_Property_Bound; 5778typedef struct _Efl_Ui_Property_Bound Efl_Ui_Property_Bound;
diff --git a/src/lib/elementary/efl_ui_widget_image.h b/src/lib/elementary/efl_ui_widget_image.h
index aafb8bd..7c775f0 100644
--- a/src/lib/elementary/efl_ui_widget_image.h
+++ b/src/lib/elementary/efl_ui_widget_image.h
@@ -72,7 +72,7 @@ struct _Efl_Ui_Image_Data
72 } async; 72 } async;
73 73
74 Efl_Ui_Image_Preload_Status preload_status; 74 Efl_Ui_Image_Preload_Status preload_status;
75 Efl_Gfx_Image_Scale_Type scale_type; 75 Efl_Gfx_Image_Scale_Method scale_type;
76 76
77 const char *stdicon; 77 const char *stdicon;
78 78
diff --git a/src/lib/elementary/efl_ui_widget_part_bg.eo b/src/lib/elementary/efl_ui_widget_part_bg.eo
index 3ed5d54..722cfb1 100644
--- a/src/lib/elementary/efl_ui_widget_part_bg.eo
+++ b/src/lib/elementary/efl_ui_widget_part_bg.eo
@@ -9,6 +9,6 @@ class @beta Efl.Ui.Widget_Part_Bg extends Efl.Ui.Widget_Part implements Efl.File
9 Efl.File.load; 9 Efl.File.load;
10 Efl.File.unload; 10 Efl.File.unload;
11 Efl.Gfx.Color.color { set; get; } 11 Efl.Gfx.Color.color { set; get; }
12 Efl.Gfx.Image.scale_type { get; set; } 12 Efl.Gfx.Image.scale_method { get; set; }
13 } 13 }
14} 14}
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 58af84b..4e49447 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -7736,7 +7736,7 @@ _efl_ui_win_part_file_load(Eo *obj, Efl_Ui_Win_Data *sd, Eo *part_obj, const cha
7736 if (file) 7736 if (file)
7737 { 7737 {
7738 bg = efl_add(EFL_UI_IMAGE_CLASS, obj); 7738 bg = efl_add(EFL_UI_IMAGE_CLASS, obj);
7739 efl_gfx_image_scale_type_set(bg, EFL_GFX_IMAGE_SCALE_TYPE_EXPAND); 7739 efl_gfx_image_scale_method_set(bg, EFL_GFX_IMAGE_SCALE_METHOD_EXPAND);
7740 ok = efl_file_simple_load(bg, file, key); 7740 ok = efl_file_simple_load(bg, file, key);
7741 if (!ok) ELM_SAFE_DEL(bg); 7741 if (!ok) ELM_SAFE_DEL(bg);
7742 _elm_win_bg_set(sd, bg); 7742 _elm_win_bg_set(sd, bg);