[EGIT] [apps/evisum] master 01/01: proclist: padding.

[Alastair Poole]

netstar pushed a commit to branch master.

http://git.enlightenment.org/apps/evisum.git/commit/?id=a27aba5966a3ad1ee97cfea090d22495d4ed7bcf

commit a27aba5966a3ad1ee97cfea090d22495d4ed7bcf
Author: Alastair Poole <nets...@gmail.com>
Date:   Mon Mar 15 10:24:04 2021 +0000

    proclist: padding.
---
 src/bin/system/machine/sensors.bogox |  5 ++++-
 src/bin/ui/ui_process_list.c         | 31 +++++++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/bin/system/machine/sensors.bogox 
b/src/bin/system/machine/sensors.bogox
index c80afeb..c4d76db 100644
--- a/src/bin/system/machine/sensors.bogox
+++ b/src/bin/system/machine/sensors.bogox
@@ -89,7 +89,8 @@ system_sensors_thermal_get(int *sensor_count)
    size_t slen = sizeof(struct sensor);
    size_t sdlen = sizeof(struct sensordev);
 
-   for (devn = 0;; devn++) {
+   for (devn = 0;; devn++)
+      {
         mibs[2] = devn;
 
         if (sysctl(mibs, 3, &snsrdev, &sdlen, NULL, 0) == -1)
@@ -264,6 +265,8 @@ _power_battery_count_get(power_t *power)
              power->batteries = t;
              power->batteries[i] = calloc(1, sizeof(bat_t));
              power->batteries[i]->name = strdup(snsrdev.xname);
+             power->batteries[i]->model = strdup("Unknown");
+             power->batteries[i]->vendor = strdup("Unknown");
              power->batteries[i]->present = true;
              power->batteries[i]->mibs[0] = mibs[0];
              power->batteries[i]->mibs[1] = mibs[1];
diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c
index c39c98d..5be81d1 100644
--- a/src/bin/ui/ui_process_list.c
+++ b/src/bin/ui/ui_process_list.c
@@ -330,17 +330,28 @@ _item_del(void *data, Evas_Object *obj EINA_UNUSED)
 static Evas_Object *
 _item_column_add(Evas_Object *tb, const char *text, int col)
 {
-   Evas_Object *rec, *lb;
+   Evas_Object *hbx, *rec, *lb;
+
+   hbx = elm_box_add(tb);
+   elm_box_horizontal_set(hbx, 1);
+   evas_object_size_hint_align_set(hbx, FILL, FILL);
+   evas_object_size_hint_weight_set(hbx, 1.0, 1.0);
+   evas_object_show(hbx);
 
    lb = elm_label_add(tb);
    evas_object_data_set(tb, text, lb);
    evas_object_size_hint_align_set(lb, FILL, FILL);
    evas_object_size_hint_weight_set(lb, EXPAND, EXPAND);
+   elm_box_pack_end(hbx, lb);
+
    rec = evas_object_rectangle_add(evas_object_evas_get(tb));
-   evas_object_data_set(lb, "rec", rec);
+   evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(2), 1);
+   elm_box_pack_end(hbx, rec);
 
+   rec = evas_object_rectangle_add(evas_object_evas_get(tb));
+   evas_object_data_set(lb, "rec", rec);
    elm_table_pack(tb, rec, col, 0, 1, 1);
-   elm_table_pack(tb, lb, col, 0, 1, 1);
+   elm_table_pack(tb, hbx, col, 0, 1, 1);
    evas_object_show(lb);
 
    return lb;
@@ -454,14 +465,26 @@ _item_create(Evas_Object *obj)
      }
    if (_field_enabled(PROC_FIELD_CPU_USAGE))
      {
+        hbx = elm_box_add(tb);
+        elm_box_horizontal_set(hbx, 1);
+        evas_object_size_hint_weight_set(hbx, 1.0, 1.0);
+        evas_object_size_hint_align_set(hbx, FILL, FILL);
+
         rec = evas_object_rectangle_add(evas_object_evas_get(tb));
+        evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(2), 1);
+        elm_box_pack_end(hbx, rec);
+
         pb = elm_progressbar_add(hbx);
         evas_object_size_hint_weight_set(pb, 0, EXPAND);
         evas_object_size_hint_align_set(pb, FILL, FILL);
         elm_progressbar_unit_format_set(pb, "%1.1f %%");
+        elm_box_pack_end(hbx, pb);
+        evas_object_show(hbx);
+
+        rec = evas_object_rectangle_add(evas_object_evas_get(tb));
         evas_object_data_set(pb, "rec", rec);
         elm_table_pack(tb, rec, i, 0, 1, 1);
-        elm_table_pack(tb, pb, i++, 0, 1, 1);
+        elm_table_pack(tb, hbx, i++, 0, 1, 1);
         evas_object_data_set(tb, "cpu_u", pb);
      }
 

--