enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

try hicolor icon theme as fallback for fdo icon setting if user's theme fails 

fix T2142
This commit is contained in:
Mike Blumenkrantz 2015-04-30 12:32:31 -04:00
parent 8d8588ff32
commit 9887db64e8
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/e_icon.c
View File

@ -447,7 +447,12 @@ e_icon_fdo_icon_set(Evas_Object *obj, const char *icon)
if (!sd->fdo) return EINA_FALSE;
path = efreet_icon_path_find(e_config->icon_theme, sd->fdo, sd->size);
if (!path) return EINA_FALSE;
if (!path)
{
if (e_util_strcmp(e_config->icon_theme, "hicolor"))
path = efreet_icon_path_find("hicolor", sd->fdo, sd->size);
if (!path) return EINA_FALSE;
}
len = strlen(icon);
if ((len > 4) && (!strcasecmp(icon + len - 4, ".edj")))
@ -908,7 +913,13 @@ _e_icon_fdo_reload(void *data)
sd->fdo_reload_timer = NULL;
sd->size = MAX(sd->w, sd->h);
path = efreet_icon_path_find(e_config->icon_theme, sd->fdo, sd->size);
if (!path) return EINA_FALSE;
if (!path)
{
if (e_util_strcmp(e_config->icon_theme, "hicolor"))
path = efreet_icon_path_find("hicolor", sd->fdo, sd->size);
if (!path) return EINA_FALSE;
}
/* smart code here */
evas_object_image_load_size_set(sd->obj, sd->size, sd->size);