summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/examples.dox2
-rw-r--r--src/bin/test_icon.c2
-rw-r--r--src/bin/test_naviframe_complex.c2
-rw-r--r--src/edje_externals/elm_icon.c4
-rw-r--r--src/examples/icon_example_01.c2
-rw-r--r--src/lib/elm_icon.h5
-rw-r--r--src/lib/elm_image.h2
-rw-r--r--src/lib/elm_map.c2
-rw-r--r--src/lib/elm_photo.c4
9 files changed, 13 insertions, 12 deletions
diff --git a/doc/examples.dox b/doc/examples.dox
index 3e432bf62..085bf56a8 100644
--- a/doc/examples.dox
+++ b/doc/examples.dox
@@ -3667,7 +3667,7 @@
3667 * algorithm used to scale the icon to the new object size is going to be 3667 * algorithm used to scale the icon to the new object size is going to be
3668 * faster, but with a lower quality. 3668 * faster, but with a lower quality.
3669 * 3669 *
3670 * elm_icon_fill_outside_set() is used to ensure that the icon will fill the 3670 * elm_image_fill_outside_set() is used to ensure that the icon will fill the
3671 * entire area available to it, even if keeping the aspect ratio. The icon 3671 * entire area available to it, even if keeping the aspect ratio. The icon
3672 * will overflow its width or height (any of them that is necessary) to the 3672 * will overflow its width or height (any of them that is necessary) to the
3673 * object area, instead of resizing the icon down until it can fit entirely in 3673 * object area, instead of resizing the icon down until it can fit entirely in
diff --git a/src/bin/test_icon.c b/src/bin/test_icon.c
index 3098d3986..1c048fa92 100644
--- a/src/bin/test_icon.c
+++ b/src/bin/test_icon.c
@@ -15,7 +15,7 @@ static void
15fill_outside_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) 15fill_outside_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
16{ 16{
17 Evas_Object *ic = (Evas_Object *)data; 17 Evas_Object *ic = (Evas_Object *)data;
18 elm_icon_fill_outside_set(ic, elm_check_state_get(obj)); 18 elm_image_fill_outside_set(ic, elm_check_state_get(obj));
19} 19}
20 20
21static void 21static void
diff --git a/src/bin/test_naviframe_complex.c b/src/bin/test_naviframe_complex.c
index f4b573d7b..507da8f74 100644
--- a/src/bin/test_naviframe_complex.c
+++ b/src/bin/test_naviframe_complex.c
@@ -64,7 +64,7 @@ _content_image_new(Evas_Object *parent, const char *img)
64 64
65 ic = elm_icon_add(parent); 65 ic = elm_icon_add(parent);
66 elm_image_file_set(ic, img, NULL); 66 elm_image_file_set(ic, img, NULL);
67 elm_icon_fill_outside_set(ic, EINA_FALSE); 67 elm_image_fill_outside_set(ic, EINA_FALSE);
68 return ic; 68 return ic;
69} 69}
70 70
diff --git a/src/edje_externals/elm_icon.c b/src/edje_externals/elm_icon.c
index ee056ae38..7e91d351c 100644
--- a/src/edje_externals/elm_icon.c
+++ b/src/edje_externals/elm_icon.c
@@ -71,7 +71,7 @@ external_icon_state_set(void *data __UNUSED__, Evas_Object *obj,
71 } 71 }
72 if (p->fill_outside_exists) 72 if (p->fill_outside_exists)
73 { 73 {
74 elm_icon_fill_outside_set(obj, p->fill_outside); 74 elm_image_fill_outside_set(obj, p->fill_outside);
75 param_icon->fill_outside = p->fill_outside; 75 param_icon->fill_outside = p->fill_outside;
76 } 76 }
77 if (p->prescale_size_exists) 77 if (p->prescale_size_exists)
@@ -135,7 +135,7 @@ external_icon_param_set(void *data __UNUSED__, Evas_Object *obj,
135 else if (!strcmp(param->name, "fill outside") 135 else if (!strcmp(param->name, "fill outside")
136 && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) 136 && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
137 { 137 {
138 elm_icon_fill_outside_set(obj, param->i); 138 elm_image_fill_outside_set(obj, param->i);
139 param_icon->fill_outside = param->i; 139 param_icon->fill_outside = param->i;
140 return EINA_TRUE; 140 return EINA_TRUE;
141 } 141 }
diff --git a/src/examples/icon_example_01.c b/src/examples/icon_example_01.c
index 23ec856d1..4abd30c91 100644
--- a/src/examples/icon_example_01.c
+++ b/src/examples/icon_example_01.c
@@ -34,7 +34,7 @@ elm_main(int argc, char **argv)
34 elm_image_no_scale_set(icon, EINA_TRUE); 34 elm_image_no_scale_set(icon, EINA_TRUE);
35 elm_image_resizable_set(icon, EINA_FALSE, EINA_TRUE); 35 elm_image_resizable_set(icon, EINA_FALSE, EINA_TRUE);
36 elm_image_smooth_set(icon, EINA_FALSE); 36 elm_image_smooth_set(icon, EINA_FALSE);
37 elm_icon_fill_outside_set(icon, EINA_TRUE); 37 elm_image_fill_outside_set(icon, EINA_TRUE);
38 38
39 evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 39 evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
40 elm_win_resize_object_add(win, icon); 40 elm_win_resize_object_add(win, icon);
diff --git a/src/lib/elm_icon.h b/src/lib/elm_icon.h
index ccdd46889..c753005b2 100644
--- a/src/lib/elm_icon.h
+++ b/src/lib/elm_icon.h
@@ -401,11 +401,12 @@ EINA_DEPRECATED EAPI void elm_icon_size_get(const Evas_Object *
401 * original aspect ratio. 401 * original aspect ratio.
402 * 402 *
403 * @see elm_icon_fill_outside_get() 403 * @see elm_icon_fill_outside_get()
404 * @see elm_image_fill_outside_set() 404 *
405 * @deprecated Use elm_image_fill_outside_set() instead.
405 * 406 *
406 * @ingroup Icon 407 * @ingroup Icon
407 */ 408 */
408EAPI void elm_icon_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside); 409EINA_DEPRECATED EAPI void elm_icon_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside);
409 410
410/** 411/**
411 * Get if the object is filled outside. 412 * Get if the object is filled outside.
diff --git a/src/lib/elm_image.h b/src/lib/elm_image.h
index a82a87ba3..d690eeaa4 100644
--- a/src/lib/elm_image.h
+++ b/src/lib/elm_image.h
@@ -285,7 +285,7 @@ EAPI Eina_Bool elm_image_fill_outside_get(const Evas_Object *obj);
285 * 285 *
286 * @param obj The image object 286 * @param obj The image object
287 * @param disabled If EINA_TRUE, preloading will be disabled 287 * @param disabled If EINA_TRUE, preloading will be disabled
288 * @ingroup Icon 288 * @ingroup Image
289 */ 289 */
290EAPI void elm_image_preload_disabled_set(Evas_Object *obj, Eina_Bool disabled); 290EAPI void elm_image_preload_disabled_set(Evas_Object *obj, Eina_Bool disabled);
291 291
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index ad285dce7..d73f708ff 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -1459,7 +1459,7 @@ _icon_dup(const Evas_Object *icon, Evas_Object *parent)
1459 elm_image_no_scale_set(dupp, elm_image_no_scale_get(icon)); 1459 elm_image_no_scale_set(dupp, elm_image_no_scale_get(icon));
1460 elm_image_resizable_get(icon, &size_up, &size_down); 1460 elm_image_resizable_get(icon, &size_up, &size_down);
1461 elm_image_resizable_set(dupp, size_up, size_down); 1461 elm_image_resizable_set(dupp, size_up, size_down);
1462 elm_icon_fill_outside_set(dupp, elm_image_fill_outside_get(icon)); 1462 elm_image_fill_outside_set(dupp, elm_image_fill_outside_get(icon));
1463 elm_image_prescale_set(dupp, elm_image_prescale_get(icon)); 1463 elm_image_prescale_set(dupp, elm_image_prescale_get(icon));
1464 elm_image_aspect_fixed_set(dupp, elm_image_aspect_fixed_get(icon)); 1464 elm_image_aspect_fixed_set(dupp, elm_image_aspect_fixed_get(icon));
1465 return dupp; 1465 return dupp;
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index 4a3e96773..b64787b6d 100644
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -293,7 +293,7 @@ _elm_photo_smart_add(Evas_Object *obj)
293 293
294 elm_image_resizable_set(priv->icon, EINA_TRUE, EINA_TRUE); 294 elm_image_resizable_set(priv->icon, EINA_TRUE, EINA_TRUE);
295 elm_image_smooth_set(priv->icon, EINA_TRUE); 295 elm_image_smooth_set(priv->icon, EINA_TRUE);
296 elm_icon_fill_outside_set(priv->icon, !priv->fill_inside); 296 elm_image_fill_outside_set(priv->icon, !priv->fill_inside);
297 elm_image_prescale_set(priv->icon, 0); 297 elm_image_prescale_set(priv->icon, 0);
298 298
299 elm_object_scale_set(priv->icon, elm_widget_scale_get(obj)); 299 elm_object_scale_set(priv->icon, elm_widget_scale_get(obj));
@@ -410,7 +410,7 @@ elm_photo_fill_inside_set(Evas_Object *obj,
410 ELM_PHOTO_CHECK(obj); 410 ELM_PHOTO_CHECK(obj);
411 ELM_PHOTO_DATA_GET(obj, sd); 411 ELM_PHOTO_DATA_GET(obj, sd);
412 412
413 elm_icon_fill_outside_set(sd->icon, !fill); 413 elm_image_fill_outside_set(sd->icon, !fill);
414 sd->fill_inside = !!fill; 414 sd->fill_inside = !!fill;
415 415
416 _sizing_eval(obj); 416 _sizing_eval(obj);