enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

Luncher: Don't use a second object for the overlay. This requires EFL updating due to theme.

This commit is contained in:
Stephen 'Okra' Houston 2017-08-23 17:06:57 -05:00
parent ae9966970b
commit ccf30bd726
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/luncher/bar.c
View File

@ -250,7 +250,6 @@ _bar_icon_del(Instance *inst, Icon *ic)
if (!inst->main_del)
_bar_aspect(inst);
evas_object_del(ic->o_icon);
evas_object_del(ic->o_overlay);
evas_object_del(ic->o_layout);
eina_hash_del_by_data(inst->icons_desktop_hash, ic);
eina_hash_del_by_data(inst->icons_clients_hash, ic);
@ -1106,7 +1105,6 @@ _bar_icon_file_set(Icon *ic, Efreet_Desktop *desktop, E_Client *non_desktop_clie
k = "e/icons/unknown";
}
elm_image_file_set(ic->o_icon, path, k);
elm_image_file_set(ic->o_overlay, path, k);
}
static void
@ -1223,8 +1221,6 @@ _bar_icon_add(Instance *inst, Efreet_Desktop *desktop, E_Client *non_desktop_cli
ic->o_icon = elm_icon_add(ic->o_layout);
E_EXPAND(ic->o_icon);
ic->o_overlay = elm_icon_add(ic->o_layout);
E_EXPAND(ic->o_overlay);
_bar_icon_file_set(ic, desktop, non_desktop_client);
@ -1261,10 +1257,6 @@ _bar_icon_add(Instance *inst, Efreet_Desktop *desktop, E_Client *non_desktop_cli
_bar_icon_mouse_out, ic);
evas_object_show(ic->o_icon);
evas_object_size_hint_aspect_set(ic->o_overlay, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
elm_layout_content_set(ic->o_layout, "e.swallow.overlay", ic->o_overlay);
evas_object_show(ic->o_overlay);
if (desktop)
eina_hash_add(inst->icons_desktop_hash, eina_stringshare_add(desktop->orig_path), ic);
else

8
src/modules/luncher/grid.c
View File

@ -61,7 +61,6 @@ _grid_icon_del(Instance *inst, Icon *ic)
{
inst->icons = eina_list_remove(inst->icons, ic);
evas_object_del(ic->o_icon);
evas_object_del(ic->o_overlay);
evas_object_del(ic->o_layout);
if (ic->desktop)
efreet_desktop_unref(ic->desktop);
@ -311,7 +310,6 @@ _grid_icon_file_set(Icon *ic, Efreet_Desktop *desktop)
k = "e/icons/unknown";
}
elm_image_file_set(ic->o_icon, path, k);
elm_image_file_set(ic->o_overlay, path, k);
}
static Icon *
@ -340,8 +338,6 @@ _grid_icon_add(Instance *inst, Efreet_Desktop *desktop)
ic->o_icon = elm_icon_add(ic->o_layout);
E_EXPAND(ic->o_icon);
ic->o_overlay = elm_icon_add(ic->o_layout);
E_EXPAND(ic->o_overlay);
_grid_icon_file_set(ic, desktop);
@ -362,10 +358,6 @@ _grid_icon_add(Instance *inst, Efreet_Desktop *desktop)
_grid_icon_mouse_out, ic);
evas_object_show(ic->o_icon);
evas_object_size_hint_aspect_set(ic->o_overlay, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
elm_layout_content_set(ic->o_layout, "e.swallow.overlay", ic->o_overlay);
evas_object_show(ic->o_overlay);
elm_layout_sizing_eval(ic->o_layout);
elm_gengrid_item_append(inst->o_icon_con, &_grid_icon_class, ic, NULL, NULL);

1
src/modules/luncher/luncher.h
View File

@ -74,7 +74,6 @@ struct _Icon
Instance *inst;
Evas_Object *o_layout;
Evas_Object *o_icon;
Evas_Object *o_overlay;
Evas_Object *o_spacera;
Evas_Object *o_spacerb;
Evas_Object *preview;