ui: ...
This commit is contained in:
parent
1c9e24bb20
commit
1703583e71
|
@ -360,6 +360,7 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
|
||||||
Animate *ad = data;
|
Animate *ad = data;
|
||||||
Ui *ui = ad->ui;
|
Ui *ui = ad->ui;
|
||||||
|
|
||||||
|
evisum_ui_config_save(ui);
|
||||||
ecore_thread_cancel(ad->thread);
|
ecore_thread_cancel(ad->thread);
|
||||||
ecore_thread_wait(ad->thread, 0.5);
|
ecore_thread_wait(ad->thread, 0.5);
|
||||||
|
|
||||||
|
|
|
@ -310,6 +310,7 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
|
||||||
pd = data;
|
pd = data;
|
||||||
ui = pd->ui;
|
ui = pd->ui;
|
||||||
|
|
||||||
|
evisum_ui_config_save(ui);
|
||||||
ecore_thread_cancel(pd->thread);
|
ecore_thread_cancel(pd->thread);
|
||||||
ecore_thread_wait(pd->thread, 0.5);
|
ecore_thread_wait(pd->thread, 0.5);
|
||||||
|
|
||||||
|
|
|
@ -187,6 +187,7 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
|
||||||
|
|
||||||
ui = pd->ui;
|
ui = pd->ui;
|
||||||
|
|
||||||
|
evisum_ui_config_save(ui);
|
||||||
ecore_thread_cancel(pd->thread);
|
ecore_thread_cancel(pd->thread);
|
||||||
ecore_thread_wait(pd->thread, 0.5);
|
ecore_thread_wait(pd->thread, 0.5);
|
||||||
|
|
||||||
|
|
|
@ -305,6 +305,7 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
|
||||||
Ui *ui = pd->ui;
|
Ui *ui = pd->ui;
|
||||||
Network_Interface *iface;
|
Network_Interface *iface;
|
||||||
|
|
||||||
|
evisum_ui_config_save(ui);
|
||||||
ecore_thread_cancel(pd->thread);
|
ecore_thread_cancel(pd->thread);
|
||||||
ecore_thread_wait(pd->thread, 0.5);
|
ecore_thread_wait(pd->thread, 0.5);
|
||||||
eina_list_free(pd->purge);
|
eina_list_free(pd->purge);
|
||||||
|
@ -346,11 +347,11 @@ ui_network_win_add(Ui *ui)
|
||||||
evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _win_del_cb, pd);
|
evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _win_del_cb, pd);
|
||||||
evas_object_event_callback_add(win, EVAS_CALLBACK_MOVE, _win_move_cb, pd);
|
evas_object_event_callback_add(win, EVAS_CALLBACK_MOVE, _win_move_cb, pd);
|
||||||
evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE, _win_resize_cb, pd);
|
evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE, _win_resize_cb, pd);
|
||||||
evas_object_event_callback_add(win, EVAS_CALLBACK_KEY_DOWN, _win_key_down_cb, pd);
|
|
||||||
|
|
||||||
bx = elm_box_add(win);
|
bx = elm_box_add(win);
|
||||||
evas_object_size_hint_weight_set(bx, 1.0, 1.0);
|
evas_object_size_hint_weight_set(bx, 1.0, 1.0);
|
||||||
evas_object_size_hint_align_set(bx, FILL, FILL);
|
evas_object_size_hint_align_set(bx, FILL, FILL);
|
||||||
|
evas_object_event_callback_add(bx, EVAS_CALLBACK_KEY_DOWN, _win_key_down_cb, pd);
|
||||||
evas_object_show(bx);
|
evas_object_show(bx);
|
||||||
|
|
||||||
pd->glist = glist = elm_genlist_add(win);
|
pd->glist = glist = elm_genlist_add(win);
|
||||||
|
|
|
@ -225,6 +225,7 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
|
||||||
Ui_Data *pd = data;
|
Ui_Data *pd = data;
|
||||||
Ui *ui = pd->ui;
|
Ui *ui = pd->ui;
|
||||||
|
|
||||||
|
evisum_ui_config_save(ui);
|
||||||
ecore_thread_cancel(pd->thread);
|
ecore_thread_cancel(pd->thread);
|
||||||
ecore_thread_wait(pd->thread, 0.5);
|
ecore_thread_wait(pd->thread, 0.5);
|
||||||
ui->sensors.win = NULL;
|
ui->sensors.win = NULL;
|
||||||
|
|
Loading…
Reference in New Issue