aboutsummaryrefslogtreecommitdiffstats
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
parentelm/colorselector: go back to using elm_box internally (diff)
downloadefl-eb938f8a886ea211e5a99b4fceab64e4461dc771.tar.gz
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
-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)
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);
}
}