forked from enlightenment/enlightenment
Enlightenment: Sysinfo Gadget - Properly mark popup as deleted.
This commit is contained in:
parent
58a9333580
commit
62f7d684dd
|
@ -39,9 +39,18 @@ _cpumonitor_configure_cb(Evas_Object *g)
|
|||
}
|
||||
|
||||
static void
|
||||
_cpumonitor_popup_dismissed(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
|
||||
_cpumonitor_popup_dismissed(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
|
||||
{
|
||||
Instance *inst = data;
|
||||
E_FREE_FUNC(obj, evas_object_del);
|
||||
inst->cfg->cpumonitor.popup = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
_cpumonitor_popup_deleted(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
|
||||
{
|
||||
Instance *inst = data;
|
||||
inst->cfg->cpumonitor.popup = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -63,7 +72,8 @@ _cpumonitor_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA
|
|||
}
|
||||
popup = elm_ctxpopup_add(e_comp->elm);
|
||||
elm_object_style_set(popup, "noblock");
|
||||
evas_object_smart_callback_add(popup, "dismissed", _cpumonitor_popup_dismissed, NULL);
|
||||
evas_object_smart_callback_add(popup, "dismissed", _cpumonitor_popup_dismissed, inst);
|
||||
evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, _cpumonitor_popup_deleted, inst);
|
||||
|
||||
snprintf(text, sizeof(text), "%s: %d%%", _("Total CPU Usage"), inst->cfg->cpumonitor.percent);
|
||||
label = elm_label_add(popup);
|
||||
|
|
|
@ -36,9 +36,18 @@ _memusage_configure_cb(Evas_Object *g)
|
|||
}
|
||||
|
||||
static void
|
||||
_memusage_popup_dismissed(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
|
||||
_memusage_popup_dismissed(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
|
||||
{
|
||||
Instance *inst = data;
|
||||
E_FREE_FUNC(obj, evas_object_del);
|
||||
inst->cfg->memusage.popup = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
_memusage_popup_deleted(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
|
||||
{
|
||||
Instance *inst = data;
|
||||
inst->cfg->memusage.popup = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -60,7 +69,8 @@ _memusage_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_U
|
|||
}
|
||||
popup = elm_ctxpopup_add(e_comp->elm);
|
||||
elm_object_style_set(popup, "noblock");
|
||||
evas_object_smart_callback_add(popup, "dismissed", _memusage_popup_dismissed, NULL);
|
||||
evas_object_smart_callback_add(popup, "dismissed", _memusage_popup_dismissed, inst);
|
||||
evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, _memusage_popup_deleted, inst);
|
||||
|
||||
snprintf(text, sizeof(text), "%s: %d%%<br>%s: %d%%", _("Total Memory Usage"),
|
||||
inst->cfg->memusage.real, _("Total Swap Usage"), inst->cfg->memusage.swap);
|
||||
|
|
|
@ -42,9 +42,18 @@ _netstatus_configure_cb(Evas_Object *g)
|
|||
}
|
||||
|
||||
static void
|
||||
_netstatus_popup_dismissed(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
|
||||
_netstatus_popup_dismissed(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
|
||||
{
|
||||
Instance *inst = data;
|
||||
E_FREE_FUNC(obj, evas_object_del);
|
||||
inst->cfg->netstatus.popup = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
_netstatus_popup_deleted(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
|
||||
{
|
||||
Instance *inst = data;
|
||||
inst->cfg->netstatus.popup = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -66,7 +75,8 @@ _netstatus_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_
|
|||
}
|
||||
popup = elm_ctxpopup_add(e_comp->elm);
|
||||
elm_object_style_set(popup, "noblock");
|
||||
evas_object_smart_callback_add(popup, "dismissed", _netstatus_popup_dismissed, NULL);
|
||||
evas_object_smart_callback_add(popup, "dismissed", _netstatus_popup_dismissed, inst);
|
||||
evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, _netstatus_popup_deleted, inst);
|
||||
|
||||
snprintf(text, sizeof(text), "%s<br>%s", inst->cfg->netstatus.instring, inst->cfg->netstatus.outstring);
|
||||
label = elm_label_add(popup);
|
||||
|
|
Loading…
Reference in New Issue