netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=7ac04e84fa08f28a2364a99cb4cac4a7bf1a2404
commit 7ac04e84fa08f28a2364a99cb4cac4a7bf1a2404
Author: Alastair Poole <nets...@gmail.com>
Date: Fri Jan 1 20:56:29 2021 +0000
ui_proc: save on quit.
Expensive to save like that, just save values in memory then save
on quit.
---
src/bin/ui/ui.c | 14 ++++++-------
src/bin/ui/ui_process_list.c | 48 ++++++++------------------------------------
src/bin/ui/ui_sensors.c | 2 +-
3 files changed, 15 insertions(+), 49 deletions(-)
diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c
index 396ebb2..5f97eef 100644
--- a/src/bin/ui/ui.c
+++ b/src/bin/ui/ui.c
@@ -35,11 +35,10 @@ evisum_ui_config_save(Ui *ui)
notify = EINA_TRUE;
}
- evas_object_geometry_get(ui->proc.win, &x, &y, &w, &h);
- _evisum_config->proc.width = w;
- _evisum_config->proc.height = h;
- _evisum_config->proc.x = x;
- _evisum_config->proc.y = y;
+ _evisum_config->proc.width = ui->proc.width;
+ _evisum_config->proc.height = ui->proc.height;
+ _evisum_config->proc.x = ui->proc.x;
+ _evisum_config->proc.y = ui->proc.y;
_evisum_config->proc.restart = ui->proc.restart;
_evisum_config->proc.sort_type = ui->proc.sort_type;
_evisum_config->proc.sort_reverse = ui->proc.sort_reverse;
@@ -102,12 +101,11 @@ evisum_ui_config_load(Ui *ui)
_evisum_config = config_load();
+ evisum_ui_backgrounds_enabled_set(_evisum_config->backgrounds);
+
ui->proc.sort_type = _evisum_config->proc.sort_type;
ui->proc.sort_reverse = _evisum_config->proc.sort_reverse;
ui->proc.poll_delay = _evisum_config->proc.poll_delay;
-
- evisum_ui_backgrounds_enabled_set(_evisum_config->backgrounds);
-
ui->proc.show_kthreads = _evisum_config->proc.show_kthreads;
proc_info_kthreads_show_set(ui->proc.show_kthreads);
ui->proc.show_user = _evisum_config->proc.show_user;
diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c
index 3348678..64e40e3 100644
--- a/src/bin/ui/ui_process_list.c
+++ b/src/bin/ui/ui_process_list.c
@@ -828,8 +828,6 @@ _btn_clicked_state_save(Ui_Data *pd, Evas_Object *btn)
_btn_icon_state_update(btn, ui->proc.sort_reverse);
- evisum_ui_config_save(ui);
-
_process_list_update(pd);
elm_scroller_page_bring_in(pd->scroller, 0, 0);
@@ -1201,28 +1199,6 @@ _btn_menu_clicked_cb(void *data, Evas_Object *obj,
_main_menu_dismissed_cb(pd, NULL, NULL);
}
-static void
-_genlist_scroll_start_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui_Data *pd;
-
- pd = data;
-
- pd->skip_wait = 0;
-}
-
-static void
-_genlist_scroll_end_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Ui_Data *pd;
-
- pd = data;
-
- pd->skip_wait = 1;
-}
-
static Evas_Object *
_ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
{
@@ -1387,15 +1363,6 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
_item_pid_secondary_clicked_cb, pd);
evas_object_smart_callback_add(pd->genlist, "unrealized",
_item_unrealized_cb, pd);
- evas_object_smart_callback_add(pd->genlist, "scroll,anim,start",
- _genlist_scroll_start_cb, pd);
- evas_object_smart_callback_add(pd->genlist, "scroll,anim,stop",
- _genlist_scroll_end_cb, pd);
- evas_object_smart_callback_add(pd->genlist, "scroll,drag,start",
- _genlist_scroll_start_cb, pd);
- evas_object_smart_callback_add(pd->genlist, "scroll,drag,stop",
- _genlist_scroll_end_cb, pd);
-
elm_box_pack_end(bx, tbl);
fr = elm_frame_add(parent);
@@ -1549,8 +1516,11 @@ _resize_timer_cb(void *data)
static void
_win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
- Ui_Data *pd = data;
- Ui *ui = pd->ui;
+ Ui_Data *pd;
+ Ui *ui;
+
+ pd = data;
+ ui = pd->ui;
elm_genlist_realized_items_update(pd->genlist);
@@ -1563,7 +1533,8 @@ _win_resize_cb(void *data, Evas *e, Evas_Object *obj,
void *event_info)
else
ecore_timer_reset(pd->resize_timer);
- evisum_ui_config_save(ui);
+ evas_object_geometry_get(obj, NULL, NULL,
+ &ui->proc.width, &ui->proc.height);
}
static Eina_Bool
@@ -1600,14 +1571,11 @@ _win_move_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj, void *event_info
{
Ui_Data *pd;
Ui *ui;
- Evas_Coord x = 0, y = 0;
pd = data;
ui = pd->ui;
- evas_object_geometry_get(obj, &x, &y, NULL, NULL);
- ui->proc.x = x;
- ui->proc.y = y;
+ evas_object_geometry_get(obj, &ui->proc.x, &ui->proc.y, NULL, NULL);
}
static void
diff --git a/src/bin/ui/ui_sensors.c b/src/bin/ui/ui_sensors.c
index ad50204..210359d 100644
--- a/src/bin/ui/ui_sensors.c
+++ b/src/bin/ui/ui_sensors.c
@@ -303,7 +303,7 @@ ui_win_sensors_add(Ui *ui, Evas_Object *parent)
fr = elm_frame_add(win);
evas_object_size_hint_weight_set(fr, EXPAND, 0);
evas_object_size_hint_align_set(fr, FILL, FILL);
- elm_object_text_set(fr, _("Batteries"));
+ elm_object_text_set(fr, _("Power"));
evas_object_show(fr);
bx = elm_box_add(win);
--
