Get the icon widget's evas once and reuse it.

SVN revision: 27202
This commit is contained in:
Christopher Michael 2006-11-24 09:21:54 +00:00
parent 90eaa9c937
commit e3ef791993
1 changed files with 6 additions and 5 deletions

View File

@ -287,6 +287,7 @@ _cb_icon_sel(void *data, void *data2)
static Evas_Object * static Evas_Object *
_get_icon(void *data) _get_icon(void *data)
{ {
Evas *evas;
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
Evas_Object *icon = NULL; Evas_Object *icon = NULL;
const char *tmp; const char *tmp;
@ -302,26 +303,26 @@ _get_icon(void *data)
if (cfdata->type == DEFAULT) return NULL; if (cfdata->type == DEFAULT) return NULL;
evas = evas_object_evas_get(cfdata->gui.icon_wid);
switch (cfdata->type) switch (cfdata->type)
{ {
case THUMB: case THUMB:
icon = edje_object_add(evas_object_evas_get(cfdata->gui.icon_wid)); icon = edje_object_add(evas);
e_theme_edje_object_set(icon, "base/theme/fileman", "e/icons/fileman/file"); e_theme_edje_object_set(icon, "base/theme/fileman", "e/icons/fileman/file");
break; break;
case THEME: case THEME:
icon = edje_object_add(evas_object_evas_get(cfdata->gui.icon_wid)); icon = edje_object_add(evas);
snprintf(buf, sizeof(buf), "e/icons/fileman/mime/%s", cfdata->mime); snprintf(buf, sizeof(buf), "e/icons/fileman/mime/%s", cfdata->mime);
if (!e_theme_edje_object_set(icon, "base/theme/fileman", buf)) if (!e_theme_edje_object_set(icon, "base/theme/fileman", buf))
e_theme_edje_object_set(icon, "base/theme/fileman", "e/icons/fileman/file"); e_theme_edje_object_set(icon, "base/theme/fileman", "e/icons/fileman/file");
break; break;
case EDJ: case EDJ:
icon = edje_object_add(evas_object_evas_get(cfdata->gui.icon_wid)); icon = edje_object_add(evas);
edje_object_file_set(icon, cfdata->file, "icon"); edje_object_file_set(icon, cfdata->file, "icon");
e_widget_disabled_set(cfdata->gui.icon_wid, 0); e_widget_disabled_set(cfdata->gui.icon_wid, 0);
break; break;
case IMG: case IMG:
icon = e_widget_image_add_from_file(evas_object_evas_get(cfdata->gui.icon_wid), icon = e_widget_image_add_from_file(evas, cfdata->file, 48, 48);
cfdata->file, 48, 48);
e_widget_disabled_set(cfdata->gui.icon_wid, 0); e_widget_disabled_set(cfdata->gui.icon_wid, 0);
break; break;
default: default: