kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Icon: no more reimplement sizing_eval 

The code there was trying to reload the icon to have an
image that should match the requested size, this was totally
wrong, the calculation was always resulting in an image bigger
than the needed.

It was also useless as this logic is yet handled in the resize
callback.
This commit is contained in:
Davide Andreoli 2015-01-25 15:39:43 +01:00
parent 2f6a3eb9a2
commit f1ab68d14d
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
legacy/elementary/src/lib/elm_icon.c
View File

@ -309,33 +309,6 @@ _icon_freedesktop_set(Evas_Object *obj,
return EINA_FALSE;
}
EOLIAN static void
_elm_icon_elm_image_sizing_eval(Eo *obj, Elm_Icon_Data *sd)
{
int w, h;
if (sd->in_eval) return;
sd->in_eval++;
elm_image_object_size_get(obj, &w, &h);
if (sd->freedesktop.use && sd->stdicon)
{
int size;
/* This icon has been set to a freedesktop icon, and the requested
appears to have a different size than the requested size, so try to
request another, higher resolution, icon.
FIXME: Find a better heuristic to determine if there should be
an icon with a different resolution. */
size = ((w / 16) + 1) * 16;
_icon_freedesktop_set(obj, sd->stdicon, size);
}
eo_do_super(obj, MY_CLASS, elm_obj_image_sizing_eval());
sd->in_eval--;
}
static void
_edje_signal_callback(void *data,
Evas_Object *obj EINA_UNUSED,

1
legacy/elementary/src/lib/elm_icon.eo
View File

@ -101,7 +101,6 @@ class Elm_Icon (Elm_Image)
Evas.Object_Smart.del;
Elm_Widget.theme_apply;
Elm_Image.memfile.set;
Elm_Image.sizing_eval;
Efl.File.file.set;
}
events {