netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=230dd596acb901950466fbc2d6ff4f749d1feeb5
commit 230dd596acb901950466fbc2d6ff4f749d1feeb5
Author: Alastair Poole <nets...@gmail.com>
Date: Wed Feb 3 09:56:56 2021 +0000
Revert "proclist: GROW"
This reverts commit e51e4e664786c7df894c5122d29505291a27e0f7.
---
src/bin/ui/ui_process_list.c | 19 +++++++------------
src/bin/ui/ui_util.h | 3 +--
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c
index 9e8afb7..1b7dc66 100644
--- a/src/bin/ui/ui_process_list.c
+++ b/src/bin/ui/ui_process_list.c
@@ -363,7 +363,7 @@ _item_create(Evas_Object *obj)
lb = _item_column_add(tbl, "proc_state", i++);
evas_object_size_hint_align_set(lb, 1.0, FILL);
rec = evas_object_rectangle_add(evas_object_evas_get(obj));
- evas_object_size_hint_min_set(rec, 8, 1);
+ evas_object_size_hint_min_set(rec, 4, 1);
evas_object_size_hint_max_set(rec, 4, -1);
elm_table_pack(tbl, rec, i++, 0, 1, 1);
@@ -548,9 +548,6 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
evas_object_geometry_get(pd->btn_time, NULL, NULL, &w, NULL);
lb = evas_object_data_get(it->obj, "proc_time");
- evas_object_geometry_get(lb, NULL, NULL, &ow, NULL);
- if (ow > w)
- evas_object_size_hint_min_set(pd->btn_cmd, w, 1);
_run_time_set(buf, sizeof(buf), proc->run_time);
if (strcmp(buf, elm_object_text_get(lb)))
@@ -559,11 +556,9 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
evas_object_size_hint_min_set(rec, w, 1);
evas_object_show(lb);
+ pb = evas_object_data_get(it->obj, "proc_cpu_usage");
evas_object_geometry_get(pd->btn_state, NULL, NULL, &w, NULL);
lb = evas_object_data_get(it->obj, "proc_state");
- evas_object_geometry_get(lb, NULL, NULL, &ow, NULL);
- if (ow > w)
- evas_object_size_hint_min_set(pd->btn_cmd, w, 1);
snprintf(buf, sizeof(buf), "%s", proc->state);
if (strcmp(buf, elm_object_text_get(lb)))
elm_object_text_set(lb, buf);
@@ -1405,7 +1400,7 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
(ui->proc.sort_type == SORT_BY_RSS ?
ui->proc.sort_reverse : 0),
ui->proc.sort_type == SORT_BY_RSS);
- evas_object_size_hint_weight_set(btn, EXPAND, 0);
+ evas_object_size_hint_weight_set(btn, 1.0, 0);
evas_object_size_hint_align_set(btn, FILL, FILL);
elm_object_text_set(btn, _("res"));
evas_object_show(btn);
@@ -1441,10 +1436,10 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
pd->btn_time = btn = elm_button_add(parent);
_btn_icon_state_init(btn,
- (ui->proc.sort_type == SORT_BY_TIME ?
+ (ui->proc.sort_type == SORT_BY_CPU ?
ui->proc.sort_reverse : 0),
- ui->proc.sort_type == SORT_BY_TIME);
- evas_object_size_hint_weight_set(btn, GROW, 0);
+ ui->proc.sort_type == SORT_BY_CPU);
+ evas_object_size_hint_weight_set(btn, 0, 0);
evas_object_size_hint_align_set(btn, FILL, FILL);
elm_object_text_set(btn, _("time"));
evas_object_show(btn);
@@ -1457,7 +1452,7 @@ _ui_content_system_add(Ui_Data *pd, Evas_Object *parent)
(ui->proc.sort_type == SORT_BY_STATE ?
ui->proc.sort_reverse : 0),
ui->proc.sort_type == SORT_BY_STATE);
- evas_object_size_hint_weight_set(btn, GROW, 0);
+ evas_object_size_hint_weight_set(btn, 0, 0);
evas_object_size_hint_align_set(btn, FILL, FILL);
elm_object_text_set(btn, _("state"));
evas_object_show(btn);
diff --git a/src/bin/ui/ui_util.h b/src/bin/ui/ui_util.h
index 7865363..32003ed 100644
--- a/src/bin/ui/ui_util.h
+++ b/src/bin/ui/ui_util.h
@@ -4,9 +4,8 @@
#include <Evas.h>
#include "system/process.h"
-#define FILL EVAS_HINT_FILL
+#define FILL EVAS_HINT_FILL
#define EXPAND EVAS_HINT_EXPAND
-#define GROW 0.00001
#define TAB_BTN_WIDTH 74
#define TAB_BTN_HEIGHT 2
--
