forked from enlightenment/enlightenment
add function to add an icon given an icon path or theme name
use this for desktop_icon_add() SVN revision: 29207
This commit is contained in:
parent
0cf67a84aa
commit
73850bfc73
|
@ -839,11 +839,19 @@ e_util_desktop_icon_add(Efreet_Desktop *desktop, const char *size, Evas *evas)
|
||||||
{
|
{
|
||||||
if ((!desktop) || (!desktop->icon)) return NULL;
|
if ((!desktop) || (!desktop->icon)) return NULL;
|
||||||
|
|
||||||
if (desktop->icon[0] == '/') return e_util_icon_add(desktop->icon, evas);
|
return e_util_icon_theme_icon_add(desktop->icon, size, evas);
|
||||||
|
}
|
||||||
|
|
||||||
|
EAPI Evas_Object *
|
||||||
|
e_util_icon_theme_icon_add(const char *icon_name, const char *size, Evas *evas)
|
||||||
|
{
|
||||||
|
if (!icon_name) return NULL;
|
||||||
|
if (icon_name[0] == '/') return e_util_icon_add(icon_name, evas);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const char *path;
|
const char *path;
|
||||||
path = efreet_icon_path_find(e_config->icon_theme, desktop->icon, size);
|
path = efreet_icon_path_find(e_config->icon_theme, icon_name, size);
|
||||||
|
printf("path: %s\n", path);
|
||||||
if (path) return e_util_icon_add(path, evas);
|
if (path) return e_util_icon_add(path, evas);
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -49,6 +49,7 @@ EAPI void e_util_library_path_strip(void);
|
||||||
EAPI void e_util_library_path_restore(void);
|
EAPI void e_util_library_path_restore(void);
|
||||||
EAPI Evas_Object *e_util_icon_add(const char *path, Evas *evas);
|
EAPI Evas_Object *e_util_icon_add(const char *path, Evas *evas);
|
||||||
EAPI Evas_Object *e_util_desktop_icon_add(Efreet_Desktop *desktop, const char *size, Evas *evas);
|
EAPI Evas_Object *e_util_desktop_icon_add(Efreet_Desktop *desktop, const char *size, Evas *evas);
|
||||||
|
EAPI Evas_Object * e_util_icon_theme_icon_add(const char *icon_name, const char *size, Evas *evas);
|
||||||
EAPI void e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop, const char *size, E_Menu_Item *mi);
|
EAPI void e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop, const char *size, E_Menu_Item *mi);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue