shutdown: allow control of cleaning up.
Flag to shutdown now or ordered triggering callbacks.
This commit is contained in:
parent
d2a72510cb
commit
a5461ad416
|
@ -46,6 +46,8 @@ _win_add(void)
|
||||||
if (!ui)
|
if (!ui)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
ui->shutdown_now = EINA_TRUE;
|
||||||
|
|
||||||
evas_object_smart_callback_add(win, "delete,request", _win_del_cb, ui);
|
evas_object_smart_callback_add(win, "delete,request", _win_del_cb, ui);
|
||||||
evas_object_show(win);
|
evas_object_show(win);
|
||||||
|
|
||||||
|
|
|
@ -747,7 +747,7 @@ _quit_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
|
||||||
{
|
{
|
||||||
Ui *ui = data;
|
Ui *ui = data;
|
||||||
|
|
||||||
evas_object_hide(ui->win);
|
ui->shutdown_now = EINA_TRUE;
|
||||||
evisum_ui_shutdown(ui);
|
evisum_ui_shutdown(ui);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1282,6 +1282,11 @@ _evisum_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
void
|
void
|
||||||
evisum_ui_shutdown(Ui *ui)
|
evisum_ui_shutdown(Ui *ui)
|
||||||
{
|
{
|
||||||
|
if (ui->shutdown_now)
|
||||||
|
{
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
if (ui->win_cpu)
|
if (ui->win_cpu)
|
||||||
evas_object_smart_callback_call(ui->win_cpu, "delete,request", NULL);
|
evas_object_smart_callback_call(ui->win_cpu, "delete,request", NULL);
|
||||||
if (ui->win_mem)
|
if (ui->win_mem)
|
||||||
|
|
|
@ -87,6 +87,7 @@ typedef struct Ui
|
||||||
Sort_Type sort_type;
|
Sort_Type sort_type;
|
||||||
Eina_Bool sort_reverse;
|
Eina_Bool sort_reverse;
|
||||||
Eina_Bool show_self;
|
Eina_Bool show_self;
|
||||||
|
Eina_Bool shutdown_now;
|
||||||
|
|
||||||
Eina_Bool zfs_mounted;
|
Eina_Bool zfs_mounted;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue