forked from enlightenment/efl
don't require "menu/" prefix for menu icons, fall back on regular icon name
SVN revision: 63335
This commit is contained in:
parent
c705290b44
commit
f3100ad3c6
|
@ -702,7 +702,8 @@ elm_menu_item_object_icon_name_set(Elm_Menu_Item *item, const char *icon)
|
||||||
if (!*icon) return;
|
if (!*icon) return;
|
||||||
if ((item->icon_str) && (!strcmp(item->icon_str, icon))) return;
|
if ((item->icon_str) && (!strcmp(item->icon_str, icon))) return;
|
||||||
if ((snprintf(icon_tmp, sizeof(icon_tmp), "menu/%s", icon) > 0) &&
|
if ((snprintf(icon_tmp, sizeof(icon_tmp), "menu/%s", icon) > 0) &&
|
||||||
(elm_icon_standard_set(item->content, icon_tmp)))
|
(elm_icon_standard_set(item->content, icon_tmp) ||
|
||||||
|
elm_icon_standard_set(item->content, icon)))
|
||||||
{
|
{
|
||||||
eina_stringshare_replace(&item->icon_str, icon);
|
eina_stringshare_replace(&item->icon_str, icon);
|
||||||
edje_object_signal_emit(item->base.view, "elm,state,icon,visible", "elm");
|
edje_object_signal_emit(item->base.view, "elm,state,icon,visible", "elm");
|
||||||
|
|
Loading…
Reference in New Issue