summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-07-31 14:37:41 -0400
committerCedric BAIL <cedric.bail@free.fr>2019-07-31 14:00:18 -0700
commiteb938f8a886ea211e5a99b4fceab64e4461dc771 (patch)
tree56ed347eaa3ce6ebd36f34131c3057b7e2939891 /src/lib
parent02f1ce8d54096e9de7088c8f09981178306afeed (diff)
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
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elementary/efl_ui_win.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index d0cad8288b..e496515015 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -4612,18 +4612,30 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style)
4612 else 4612 else
4613 { 4613 {
4614 Eina_Bool set = EINA_FALSE; 4614 Eina_Bool set = EINA_FALSE;
4615 Eina_Bool legacy = elm_widget_is_legacy(sd->obj);
4615 4616
4616 sd->icon = elm_icon_add(sd->obj); 4617 if (legacy)
4618 sd->icon = elm_icon_add(sd->obj);
4619 else
4620 sd->icon = efl_add(EFL_UI_IMAGE_CLASS, sd->obj);
4617 4621
4618 if (sd->icon_name) 4622 if (sd->icon_name)
4619 set = elm_icon_standard_set(sd->icon, sd->icon_name); 4623 {
4624 if (legacy)
4625 set = elm_icon_standard_set(sd->icon, sd->icon_name);
4626 else
4627 set = efl_ui_image_icon_set(sd->icon, sd->icon_name);
4628 }
4620 if (((!sd->icon_name) || (!set)) && _elm_appname) 4629 if (((!sd->icon_name) || (!set)) && _elm_appname)
4621 { 4630 {
4622 Efreet_Desktop *d; 4631 Efreet_Desktop *d;
4623 d = efreet_util_desktop_exec_find(_elm_appname); 4632 d = efreet_util_desktop_exec_find(_elm_appname);
4624 if (d) 4633 if (d)
4625 { 4634 {
4626 elm_icon_standard_set(sd->icon, d->icon); 4635 if (legacy)
4636 elm_icon_standard_set(sd->icon, d->icon);
4637 else
4638 efl_ui_image_icon_set(sd->icon, d->icon);
4627 efreet_desktop_free(d); 4639 efreet_desktop_free(d);
4628 } 4640 }
4629 } 4641 }