enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

efl_ui/win: use efl_ui_image internally for non-legacy widgets 

switch to using a fully non-legacy widget when this is not being created
with elm_win_add

Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D9466
This commit is contained in:
Mike Blumenkrantz 2019-07-31 14:37:41 -04:00 committed by Cedric BAIL
parent 02f1ce8d54
commit eb938f8a88
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/elementary/efl_ui_win.c
View File

@ -4612,18 +4612,30 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style)
else
{
Eina_Bool set = EINA_FALSE;
Eina_Bool legacy = elm_widget_is_legacy(sd->obj);
sd->icon = elm_icon_add(sd->obj);
if (legacy)
sd->icon = elm_icon_add(sd->obj);
else
sd->icon = efl_add(EFL_UI_IMAGE_CLASS, sd->obj);
if (sd->icon_name)
set = elm_icon_standard_set(sd->icon, sd->icon_name);
{
if (legacy)
set = elm_icon_standard_set(sd->icon, sd->icon_name);
else
set = efl_ui_image_icon_set(sd->icon, sd->icon_name);
}
if (((!sd->icon_name) || (!set)) && _elm_appname)
{
Efreet_Desktop *d;
d = efreet_util_desktop_exec_find(_elm_appname);
if (d)
{
elm_icon_standard_set(sd->icon, d->icon);
if (legacy)
elm_icon_standard_set(sd->icon, d->icon);
else
efl_ui_image_icon_set(sd->icon, d->icon);
efreet_desktop_free(d);
}
}