[elm] Forgotten elm icon function to deprecate in favor of an image one.

SVN revision: 73017
This commit is contained in:
Gustavo Lima Chaves 2012-06-28 18:40:35 +00:00
parent b2c73beb86
commit cd1f900a46
9 changed files with 13 additions and 12 deletions

View File

@ -3667,7 +3667,7 @@
* algorithm used to scale the icon to the new object size is going to be * algorithm used to scale the icon to the new object size is going to be
* faster, but with a lower quality. * faster, but with a lower quality.
* *
* elm_icon_fill_outside_set() is used to ensure that the icon will fill the * elm_image_fill_outside_set() is used to ensure that the icon will fill the
* entire area available to it, even if keeping the aspect ratio. The icon * entire area available to it, even if keeping the aspect ratio. The icon
* will overflow its width or height (any of them that is necessary) to the * will overflow its width or height (any of them that is necessary) to the
* object area, instead of resizing the icon down until it can fit entirely in * object area, instead of resizing the icon down until it can fit entirely in

View File

@ -15,7 +15,7 @@ static void
fill_outside_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) fill_outside_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
{ {
Evas_Object *ic = (Evas_Object *)data; Evas_Object *ic = (Evas_Object *)data;
elm_icon_fill_outside_set(ic, elm_check_state_get(obj)); elm_image_fill_outside_set(ic, elm_check_state_get(obj));
} }
static void static void

View File

@ -64,7 +64,7 @@ _content_image_new(Evas_Object *parent, const char *img)
ic = elm_icon_add(parent); ic = elm_icon_add(parent);
elm_image_file_set(ic, img, NULL); elm_image_file_set(ic, img, NULL);
elm_icon_fill_outside_set(ic, EINA_FALSE); elm_image_fill_outside_set(ic, EINA_FALSE);
return ic; return ic;
} }

View File

@ -71,7 +71,7 @@ external_icon_state_set(void *data __UNUSED__, Evas_Object *obj,
} }
if (p->fill_outside_exists) if (p->fill_outside_exists)
{ {
elm_icon_fill_outside_set(obj, p->fill_outside); elm_image_fill_outside_set(obj, p->fill_outside);
param_icon->fill_outside = p->fill_outside; param_icon->fill_outside = p->fill_outside;
} }
if (p->prescale_size_exists) if (p->prescale_size_exists)
@ -135,7 +135,7 @@ external_icon_param_set(void *data __UNUSED__, Evas_Object *obj,
else if (!strcmp(param->name, "fill outside") else if (!strcmp(param->name, "fill outside")
&& param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{ {
elm_icon_fill_outside_set(obj, param->i); elm_image_fill_outside_set(obj, param->i);
param_icon->fill_outside = param->i; param_icon->fill_outside = param->i;
return EINA_TRUE; return EINA_TRUE;
} }

View File

@ -34,7 +34,7 @@ elm_main(int argc, char **argv)
elm_image_no_scale_set(icon, EINA_TRUE); elm_image_no_scale_set(icon, EINA_TRUE);
elm_image_resizable_set(icon, EINA_FALSE, EINA_TRUE); elm_image_resizable_set(icon, EINA_FALSE, EINA_TRUE);
elm_image_smooth_set(icon, EINA_FALSE); elm_image_smooth_set(icon, EINA_FALSE);
elm_icon_fill_outside_set(icon, EINA_TRUE); elm_image_fill_outside_set(icon, EINA_TRUE);
evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, icon); elm_win_resize_object_add(win, icon);

View File

@ -401,11 +401,12 @@ EINA_DEPRECATED EAPI void elm_icon_size_get(const Evas_Object *
* original aspect ratio. * original aspect ratio.
* *
* @see elm_icon_fill_outside_get() * @see elm_icon_fill_outside_get()
* @see elm_image_fill_outside_set() *
* @deprecated Use elm_image_fill_outside_set() instead.
* *
* @ingroup Icon * @ingroup Icon
*/ */
EAPI void elm_icon_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside); EINA_DEPRECATED EAPI void elm_icon_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside);
/** /**
* Get if the object is filled outside. * Get if the object is filled outside.

View File

@ -285,7 +285,7 @@ EAPI Eina_Bool elm_image_fill_outside_get(const Evas_Object *obj);
* *
* @param obj The image object * @param obj The image object
* @param disabled If EINA_TRUE, preloading will be disabled * @param disabled If EINA_TRUE, preloading will be disabled
* @ingroup Icon * @ingroup Image
*/ */
EAPI void elm_image_preload_disabled_set(Evas_Object *obj, Eina_Bool disabled); EAPI void elm_image_preload_disabled_set(Evas_Object *obj, Eina_Bool disabled);

View File

@ -1459,7 +1459,7 @@ _icon_dup(const Evas_Object *icon, Evas_Object *parent)
elm_image_no_scale_set(dupp, elm_image_no_scale_get(icon)); elm_image_no_scale_set(dupp, elm_image_no_scale_get(icon));
elm_image_resizable_get(icon, &size_up, &size_down); elm_image_resizable_get(icon, &size_up, &size_down);
elm_image_resizable_set(dupp, size_up, size_down); elm_image_resizable_set(dupp, size_up, size_down);
elm_icon_fill_outside_set(dupp, elm_image_fill_outside_get(icon)); elm_image_fill_outside_set(dupp, elm_image_fill_outside_get(icon));
elm_image_prescale_set(dupp, elm_image_prescale_get(icon)); elm_image_prescale_set(dupp, elm_image_prescale_get(icon));
elm_image_aspect_fixed_set(dupp, elm_image_aspect_fixed_get(icon)); elm_image_aspect_fixed_set(dupp, elm_image_aspect_fixed_get(icon));
return dupp; return dupp;

View File

@ -293,7 +293,7 @@ _elm_photo_smart_add(Evas_Object *obj)
elm_image_resizable_set(priv->icon, EINA_TRUE, EINA_TRUE); elm_image_resizable_set(priv->icon, EINA_TRUE, EINA_TRUE);
elm_image_smooth_set(priv->icon, EINA_TRUE); elm_image_smooth_set(priv->icon, EINA_TRUE);
elm_icon_fill_outside_set(priv->icon, !priv->fill_inside); elm_image_fill_outside_set(priv->icon, !priv->fill_inside);
elm_image_prescale_set(priv->icon, 0); elm_image_prescale_set(priv->icon, 0);
elm_object_scale_set(priv->icon, elm_widget_scale_get(obj)); elm_object_scale_set(priv->icon, elm_widget_scale_get(obj));
@ -410,7 +410,7 @@ elm_photo_fill_inside_set(Evas_Object *obj,
ELM_PHOTO_CHECK(obj); ELM_PHOTO_CHECK(obj);
ELM_PHOTO_DATA_GET(obj, sd); ELM_PHOTO_DATA_GET(obj, sd);
elm_icon_fill_outside_set(sd->icon, !fill); elm_image_fill_outside_set(sd->icon, !fill);
sd->fill_inside = !!fill; sd->fill_inside = !!fill;
_sizing_eval(obj); _sizing_eval(obj);