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

__WIP__ 

just to show okra
This commit is contained in:
Marcel Hollerbach 2017-12-04 23:16:09 +00:00
parent b19cceb224
commit ea431832d7
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/e_gadget_runner.c
View File

@ -527,7 +527,6 @@ popup_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EI
Instance *inst = data; Instance *inst = data;
Evas_Object *ext; Evas_Object *ext;
inst->ctxpopup = NULL;
ext = evas_object_data_get(obj, "extracted"); ext = evas_object_data_get(obj, "extracted");
elm_box_unpack_all(obj); elm_box_unpack_all(obj);
inst->extracted = eina_list_remove(inst->extracted, ext); inst->extracted = eina_list_remove(inst->extracted, ext);
@ -544,8 +543,13 @@ static void
popup_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) popup_hide(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{ {
Instance *inst = data; Instance *inst = data;
elm_ctxpopup_dismiss(inst->ctxpopup); if (obj == inst->ctxpopup)
evas_object_del(elm_object_content_get(inst->ctxpopup)); {
elm_ctxpopup_dismiss(inst->ctxpopup);
evas_object_del(elm_object_content_get(inst->ctxpopup));
inst->ctxpopup = NULL;
}
} }
static void static void
@ -589,6 +593,9 @@ popup_added(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
if (!efl_wl_surface_extract(event_info)) return; if (!efl_wl_surface_extract(event_info)) return;
inst->extracted = eina_list_append(inst->extracted, event_info); inst->extracted = eina_list_append(inst->extracted, event_info);
if (inst->ctxpopup)
evas_object_del(inst->ctxpopup);
inst->ctxpopup = elm_ctxpopup_add(inst->box); inst->ctxpopup = elm_ctxpopup_add(inst->box);
elm_object_style_set(inst->ctxpopup, "noblock"); elm_object_style_set(inst->ctxpopup, "noblock");
evas_object_smart_callback_add(inst->ctxpopup, "dismissed", popup_dismissed, inst); evas_object_smart_callback_add(inst->ctxpopup, "dismissed", popup_dismissed, inst);