styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Luncher: When the icon is deleted, don't leave client menu callbacks hanging. 

This fixes T5970
This commit is contained in:
Stephen 'Okra' Houston 2017-09-11 12:50:57 -05:00
parent ed49a4e9d1
commit 81fc3d6837
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ static Eina_Bool _bar_icon_preview_show(void *data);
static Eina_Bool _bar_icon_preview_hide(void *data);
static void _bar_icon_del(Instance *inst, Icon *ic);
static void _bar_exec_new_show(void *data, Evas *e, Evas_Object *obj, void *event_data);
static void _bar_icon_preview_menu_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_data EINA_UNUSED);
static void
_bar_aspect(Instance *inst)
@ -235,6 +236,8 @@ _bar_icon_del(Instance *inst, Icon *ic)
E_Client *ec;
inst->icons = eina_list_remove(inst->icons, ic);
if (ic->client_menu)
evas_object_event_callback_del_full(ic->client_menu, EVAS_CALLBACK_HIDE, _bar_icon_preview_menu_hide, ic);
if (ic->preview)
_bar_icon_preview_hide(ic);
if (!inst->main_del)
@ -719,7 +722,7 @@ _bar_icon_preview_menu_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, v
Icon *ic = data;
evas_object_event_callback_del_full(obj, EVAS_CALLBACK_HIDE, _bar_icon_preview_menu_hide, ic);
evas_object_event_callback_del_full(obj, EVAS_CALLBACK_DEL, _bar_icon_preview_menu_hide, ic);
ic->client_menu = NULL;
if (ic)
{
if (ic->preview)
@ -743,10 +746,9 @@ _bar_icon_preview_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, vo
if (ev->button == 3)
{
e_int_client_menu_show(ec, ev->canvas.x, ev->canvas.y, 0, ev->timestamp);
evas_object_event_callback_add(ec->border_menu->comp_object, EVAS_CALLBACK_DEL,
_bar_icon_preview_menu_hide, ic);
evas_object_event_callback_add(ec->border_menu->comp_object, EVAS_CALLBACK_HIDE,
_bar_icon_preview_menu_hide, ic);
ic->client_menu = ec->border_menu->comp_object;
ic->inst->current_preview_menu = EINA_TRUE;
return;
}
@ -1093,6 +1095,7 @@ _bar_icon_add(Instance *inst, Efreet_Desktop *desktop, E_Client *non_desktop_cli
ic->preview = NULL;
ic->preview_box = NULL;
ic->preview_scroller = NULL;
ic->client_menu = NULL;
ic->mouse_in_timer = NULL;
ic->mouse_out_timer = NULL;
ic->active = EINA_FALSE;

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

@ -75,6 +75,7 @@ struct _Icon
Evas_Object *preview;
Evas_Object *preview_box;
Evas_Object *preview_scroller;
Evas_Object *client_menu;
E_Exec_Instance *exec;
Efreet_Desktop *desktop;
Eina_List *execs;