netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=af44aeb0fab04c1b6a9d537e131f869df9539c66
commit af44aeb0fab04c1b6a9d537e131f869df9539c66
Author: Alastair Poole <nets...@gmail.com>
Date: Tue Mar 16 12:50:03 2021 +0000
ui: data keys.
---
src/bin/ui/ui_disk.c | 14 +++++++-------
src/bin/ui/ui_process_list.c | 2 ++
src/bin/ui/ui_process_view.c | 12 ++++++------
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/bin/ui/ui_disk.c b/src/bin/ui/ui_disk.c
index 61f0aac..871714f 100644
--- a/src/bin/ui/ui_disk.c
+++ b/src/bin/ui/ui_disk.c
@@ -55,7 +55,7 @@ _item_column_add(Evas_Object *tb, const char *text, int col)
evas_object_data_set(tb, text, lb);
rec = evas_object_rectangle_add(evas_object_evas_get(tb));
- evas_object_data_set(lb, "rect", rec);
+ evas_object_data_set(lb, "rec", rec);
elm_table_pack(tb, lb, col, 0, 1, 1);
elm_table_pack(tb, rec, col, 0, 1, 1);
@@ -122,7 +122,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
elm_object_text_set(lb, eina_slstr_printf("%s", inf->path));
evas_object_geometry_get(lb, NULL, NULL, &ow, NULL);
if (ow > w) evas_object_size_hint_min_set(pd->btn_device, w, 1);
- r = evas_object_data_get(lb, "rect");
+ r = evas_object_data_get(lb, "rec");
evas_object_size_hint_min_set(r, w, 1);
evas_object_show(lb);
@@ -131,7 +131,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
elm_object_text_set(lb, eina_slstr_printf("%s", inf->mount));
evas_object_geometry_get(lb, NULL, NULL, &ow, NULL);
if (ow > w) evas_object_size_hint_min_set(pd->btn_mount, w, 1);
- r = evas_object_data_get(lb, "rect");
+ r = evas_object_data_get(lb, "rec");
evas_object_size_hint_min_set(r, w, 1);
evas_object_show(lb);
@@ -140,7 +140,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
elm_object_text_set(lb, eina_slstr_printf("%s", inf->type_name));
evas_object_geometry_get(lb, NULL, NULL, &ow, NULL);
if (ow > w) evas_object_size_hint_min_set(pd->btn_fs, w, 1);
- r = evas_object_data_get(lb, "rect");
+ r = evas_object_data_get(lb, "rec");
evas_object_size_hint_min_set(r, w, 1);
evas_object_show(lb);
@@ -149,7 +149,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
elm_object_text_set(lb, eina_slstr_printf("%s",
evisum_size_format(inf->usage.total)));
evas_object_geometry_get(lb, NULL, NULL, &ow, NULL);
if (ow > w) evas_object_size_hint_min_set(pd->btn_total, w, 1);
- r = evas_object_data_get(lb, "rect");
+ r = evas_object_data_get(lb, "rec");
evas_object_size_hint_min_set(r, w, 1);
evas_object_show(lb);
@@ -158,7 +158,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
elm_object_text_set(lb, eina_slstr_printf("%s",
evisum_size_format(inf->usage.used)));
evas_object_geometry_get(lb, NULL, NULL, &ow, NULL);
if (ow > w) evas_object_size_hint_min_set(pd->btn_used, ow, 1);
- r = evas_object_data_get(lb, "rect");
+ r = evas_object_data_get(lb, "rec");
evas_object_size_hint_min_set(r, w, 1);
evas_object_show(lb);
@@ -168,7 +168,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
elm_object_text_set(lb, eina_slstr_printf("%s", evisum_size_format(avail)));
evas_object_geometry_get(lb, NULL, NULL, &ow, NULL);
if (ow > w) evas_object_size_hint_min_set(pd->btn_free, ow, 1);
- r = evas_object_data_get(lb, "rect");
+ r = evas_object_data_get(lb, "rec");
evas_object_size_hint_min_set(r, w, 1);
evas_object_show(lb);
diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c
index de8bdc6..ed9aa63 100644
--- a/src/bin/ui/ui_process_list.c
+++ b/src/bin/ui/ui_process_list.c
@@ -1089,7 +1089,9 @@ _btn_icon_state_update(Evas_Object *btn, Eina_Bool
reverse,
elm_icon_standard_set(ic, evisum_icon_path_get("go-down"));
else
elm_icon_standard_set(ic, evisum_icon_path_get("go-up"));
+
elm_object_part_content_set(btn, "icon", ic);
+
evas_object_show(ic);
}
diff --git a/src/bin/ui/ui_process_view.c b/src/bin/ui/ui_process_view.c
index 4a474d7..bf2e560 100644
--- a/src/bin/ui/ui_process_view.c
+++ b/src/bin/ui/ui_process_view.c
@@ -268,7 +268,7 @@ _item_column_add(Evas_Object *tb, const char *text, int col)
evas_object_data_set(tb, text, lb);
rec = evas_object_rectangle_add(evas_object_evas_get(tb));
- evas_object_data_set(lb, "rect", rec);
+ evas_object_data_set(lb, "rec", rec);
elm_table_pack(tb, lb, col, 0, 1, 1);
elm_table_pack(tb, rec, col, 0, 1, 1);
@@ -340,7 +340,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
elm_object_text_set(lb, eina_slstr_printf("%d", th->tid));
evas_object_geometry_get(lb, NULL, NULL, &ow, NULL);
if (ow > w) evas_object_size_hint_min_set(pd->threads.btn_id, w, 1);
- rec = evas_object_data_get(lb, "rect");
+ rec = evas_object_data_get(lb, "rec");
evas_object_size_hint_min_set(rec, w, 1);
evas_object_geometry_get(pd->threads.btn_name, NULL, NULL, &w, NULL);
@@ -348,7 +348,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
elm_object_text_set(lb, eina_slstr_printf("%s", th->name));
evas_object_geometry_get(lb, NULL, NULL, &ow, NULL);
if (ow > w) evas_object_size_hint_min_set(pd->threads.btn_name, w, 1);
- rec = evas_object_data_get(lb, "rect");
+ rec = evas_object_data_get(lb, "rec");
evas_object_size_hint_min_set(rec, w, 1);
evas_object_geometry_get(pd->threads.btn_state, NULL, NULL, &w, NULL);
@@ -356,7 +356,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
elm_object_text_set(lb, eina_slstr_printf("%s", th->state));
evas_object_geometry_get(lb, NULL, NULL, &ow, NULL);
if (ow > w) evas_object_size_hint_min_set(pd->threads.btn_state, w, 1);
- rec = evas_object_data_get(lb, "rect");
+ rec = evas_object_data_get(lb, "rec");
evas_object_size_hint_min_set(rec, w, 1);
evas_object_geometry_get(pd->threads.btn_cpu_id, NULL, NULL, &w, NULL);
@@ -364,7 +364,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
elm_object_text_set(lb, eina_slstr_printf("%d", th->cpu_id));
evas_object_geometry_get(lb, NULL, NULL, &ow, NULL);
if (ow > w) evas_object_size_hint_min_set(pd->threads.btn_cpu_id, w, 1);
- rec = evas_object_data_get(lb, "rect");
+ rec = evas_object_data_get(lb, "rec");
evas_object_size_hint_min_set(rec, w, 1);
pb = evas_object_data_get(it->obj, "cpu_usage");
@@ -844,7 +844,7 @@ _manual_init_cb(void *data, Ecore_Thread *thread)
int n = 1;
Data *pd = data;
- setenv("MANWIDTH", "75", 1);
+ setenv("MANWIDTH", "80", 1);
ecore_thread_feedback(thread, strdup("<code>"));
if (!strchr(pd->selected_cmd, ' '))
--
