netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=2d9ca2dc37419d4af4ad15d943d62e0fd7a38303
commit 2d9ca2dc37419d4af4ad15d943d62e0fd7a38303
Author: Alastair Poole <nets...@gmail.com>
Date: Sun Jan 3 00:58:08 2021 +0000
parents: Simple Parenting.
Firm, but loving. Is they misbehave, hit them with a cricket bat.
Keep it simple.
---
src/bin/ui/ui.c | 30 +++++++++++++++---------------
src/bin/ui/ui_cpu.c | 13 +++----------
src/bin/ui/ui_cpu.h | 2 +-
src/bin/ui/ui_disk.c | 12 ++----------
src/bin/ui/ui_disk.h | 2 +-
src/bin/ui/ui_memory.c | 12 ++----------
src/bin/ui/ui_memory.h | 2 +-
src/bin/ui/ui_process_list.c | 2 +-
src/bin/ui/ui_process_list.h | 2 +-
src/bin/ui/ui_sensors.c | 12 ++----------
src/bin/ui/ui_sensors.h | 2 +-
11 files changed, 30 insertions(+), 61 deletions(-)
diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c
index 0a3f3ad..879b261 100644
--- a/src/bin/ui/ui.c
+++ b/src/bin/ui/ui.c
@@ -171,7 +171,7 @@ _menu_memory_activity_clicked_cb(void *data, Evas_Object
*obj EINA_UNUSED,
{
Ui *ui = data;
- ui_win_memory_add(ui, NULL);
+ ui_win_memory_add(ui);
}
static void
@@ -180,7 +180,7 @@ _menu_disk_activity_clicked_cb(void *data, Evas_Object *obj
EINA_UNUSED,
{
Ui *ui = data;
- ui_win_disk_add(ui, NULL);
+ ui_win_disk_add(ui);
}
static void
@@ -189,7 +189,7 @@ _menu_sensors_activity_clicked_cb(void *data, Evas_Object
*obj EINA_UNUSED,
{
Ui *ui = data;
- ui_win_sensors_add(ui, NULL);
+ ui_win_sensors_add(ui);
}
static void
@@ -198,7 +198,7 @@ _menu_cpu_activity_clicked_cb(void *data, Evas_Object *obj
EINA_UNUSED,
{
Ui *ui = data;
- ui_win_cpu_add(ui, NULL);
+ ui_win_cpu_add(ui);
}
static void
@@ -207,7 +207,7 @@ _menu_process_view_clicked_cb(void *data, Evas_Object *obj
EINA_UNUSED,
{
Ui *ui = data;
- ui_process_list_win_add(ui, NULL);
+ ui_process_list_win_add(ui);
}
static void
@@ -481,31 +481,31 @@ evisum_ui_activate(Ui *ui, Evisum_Action action, int pid)
if (ui->proc.restart)
{
- ui_process_list_win_add(ui, NULL);
+ ui_process_list_win_add(ui);
restart = 1;
}
if (ui->cpu.restart)
{
- ui_win_cpu_add(ui, NULL);
+ ui_win_cpu_add(ui);
restart = 1;
}
if (ui->mem.restart)
{
- ui_win_memory_add(ui, NULL);
+ ui_win_memory_add(ui);
restart = 1;
}
if (ui->disk.restart)
{
- ui_win_disk_add(ui, NULL);
+ ui_win_disk_add(ui);
restart = 1;
}
if (ui->sensors.restart)
{
- ui_win_sensors_add(ui, NULL);
+ ui_win_sensors_add(ui);
restart = 1;
}
@@ -521,22 +521,22 @@ evisum_ui_activate(Ui *ui, Evisum_Action action, int pid)
switch (action)
{
case EVISUM_ACTION_DEFAULT:
- ui_process_list_win_add(ui, NULL);
+ ui_process_list_win_add(ui);
break;
case EVISUM_ACTION_PROCESS:
_process_win_add(NULL, pid, 3);
break;
case EVISUM_ACTION_CPU:
- ui_win_cpu_add(ui, NULL);
+ ui_win_cpu_add(ui);
break;
case EVISUM_ACTION_MEM:
- ui_win_memory_add(ui, NULL);
+ ui_win_memory_add(ui);
break;
case EVISUM_ACTION_STORAGE:
- ui_win_disk_add(ui, NULL);
+ ui_win_disk_add(ui);
break;
case EVISUM_ACTION_SENSORS:
- ui_win_sensors_add(ui, NULL);
+ ui_win_sensors_add(ui);
break;
}
}
diff --git a/src/bin/ui/ui_cpu.c b/src/bin/ui/ui_cpu.c
index 3a707a6..492df06 100644
--- a/src/bin/ui/ui_cpu.c
+++ b/src/bin/ui/ui_cpu.c
@@ -777,11 +777,10 @@ _win_resize_cb(void *data, Evas *e, Evas_Object *obj,
void *event_info)
}
void
-ui_win_cpu_add(Ui *ui, Evas_Object *parent)
+ui_win_cpu_add(Ui *ui)
{
Animate *ad;
Evas_Object *win, *box, *scroller;
- Evas_Coord x = 0, y = 0;
if (ui->cpu.win)
{
@@ -826,14 +825,8 @@ ui_win_cpu_add(Ui *ui, Evas_Object *parent)
if (ui->cpu.x > 0 && ui->cpu.y > 0)
evas_object_move(win, ui->cpu.x, ui->cpu.y);
else
- {
- if (parent)
- evas_object_geometry_get(parent, &x, &y, NULL, NULL);
- if (x > 0 && y > 0)
- evas_object_move(win, x + 20, y + 20);
- else
- elm_win_center(win, 1, 1);
- }
+ elm_win_center(win, 1, 1);
+
evas_object_show(win);
}
diff --git a/src/bin/ui/ui_cpu.h b/src/bin/ui/ui_cpu.h
index b4f6ea6..df1bb9c 100644
--- a/src/bin/ui/ui_cpu.h
+++ b/src/bin/ui/ui_cpu.h
@@ -5,6 +5,6 @@
#include "../system/machine.h"
void
-ui_win_cpu_add(Ui *ui, Evas_Object *parent);
+ui_win_cpu_add(Ui *ui);
#endif
diff --git a/src/bin/ui/ui_disk.c b/src/bin/ui/ui_disk.c
index 04a3919..68a68fc 100644
--- a/src/bin/ui/ui_disk.c
+++ b/src/bin/ui/ui_disk.c
@@ -545,11 +545,10 @@ _win_resize_cb(void *data, Evas *e, Evas_Object *obj,
void *event_info)
}
void
-ui_win_disk_add(Ui *ui, Evas_Object *parent)
+ui_win_disk_add(Ui *ui)
{
Evas_Object *win, *panes, *fr, *bx, *tbl, *scr;
Evas_Object *genlist, *btn;
- Evas_Coord x = 0, y = 0;
int i = 0;
if (ui->disk.win)
@@ -688,14 +687,7 @@ ui_win_disk_add(Ui *ui, Evas_Object *parent)
if (ui->disk.x > 0 && ui->disk.y > 0)
evas_object_move(win, ui->disk.x, ui->disk.y);
else
- {
- if (parent)
- evas_object_geometry_get(parent, &x, &y, NULL, NULL);
- if (x > 0 && y > 0)
- evas_object_move(win, x + 20, y + 20);
- else
- elm_win_center(win, 1, 1);
- }
+ elm_win_center(win, 1, 1);
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);
diff --git a/src/bin/ui/ui_disk.h b/src/bin/ui/ui_disk.h
index 8a33a45..b2c3665 100644
--- a/src/bin/ui/ui_disk.h
+++ b/src/bin/ui/ui_disk.h
@@ -4,6 +4,6 @@
#include "ui.h"
void
-ui_win_disk_add(Ui *ui, Evas_Object *parent);
+ui_win_disk_add(Ui *ui);
#endif
diff --git a/src/bin/ui/ui_memory.c b/src/bin/ui/ui_memory.c
index 0d77814..c1c5e1f 100644
--- a/src/bin/ui/ui_memory.c
+++ b/src/bin/ui/ui_memory.c
@@ -415,12 +415,11 @@ _win_resize_cb(void *data, Evas *e, Evas_Object *obj,
void *event_info)
}
void
-ui_win_memory_add(Ui *ui, Evas_Object *parent)
+ui_win_memory_add(Ui *ui)
{
Evas_Object *win, *lb, *bx, *tbl, *rec, *pb;
Evas_Object *fr;
int i;
- Evas_Coord x = 0, y = 0;
meminfo_t memory;
if (ui->mem.win)
@@ -531,14 +530,7 @@ ui_win_memory_add(Ui *ui, Evas_Object *parent)
if (ui->mem.x > 0 && ui->mem.y > 0)
evas_object_move(win, ui->mem.x, ui->mem.y);
else
- {
- if (parent)
- evas_object_geometry_get(parent, &x, &y, NULL, NULL);
- if (x > 0 && y > 0)
- evas_object_move(win, x + 20, y + 20);
- else
- elm_win_center(win, 1, 1);
- }
+ elm_win_center(win, 1, 1);
evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE, _win_resize_cb,
pd);
evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _win_del_cb, pd);
diff --git a/src/bin/ui/ui_memory.h b/src/bin/ui/ui_memory.h
index d5a7610..0cbe90c 100644
--- a/src/bin/ui/ui_memory.h
+++ b/src/bin/ui/ui_memory.h
@@ -5,7 +5,7 @@
#include "../system/machine.h"
void
-ui_win_memory_add(Ui *ui, Evas_Object *parent);
+ui_win_memory_add(Ui *ui);
#endif
diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c
index 0566001..c618398 100644
--- a/src/bin/ui/ui_process_list.c
+++ b/src/bin/ui/ui_process_list.c
@@ -1600,7 +1600,7 @@ _win_del_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_U
}
void
-ui_process_list_win_add(Ui *ui, Evas_Object *parent EINA_UNUSED)
+ui_process_list_win_add(Ui *ui)
{
Evas_Object *win, *icon;
Evas_Object *obj;
diff --git a/src/bin/ui/ui_process_list.h b/src/bin/ui/ui_process_list.h
index 67c4df3..8b54f6d 100644
--- a/src/bin/ui/ui_process_list.h
+++ b/src/bin/ui/ui_process_list.h
@@ -20,6 +20,6 @@ typedef enum
} Sort_Type;
void
-ui_process_list_win_add(Ui *ui, Evas_Object *parent);
+ui_process_list_win_add(Ui *ui);
#endif
diff --git a/src/bin/ui/ui_sensors.c b/src/bin/ui/ui_sensors.c
index 210359d..dbbadb5 100644
--- a/src/bin/ui/ui_sensors.c
+++ b/src/bin/ui/ui_sensors.c
@@ -260,13 +260,12 @@ _win_resize_cb(void *data, Evas *e, Evas_Object *obj,
void *event_info)
}
void
-ui_win_sensors_add(Ui *ui, Evas_Object *parent)
+ui_win_sensors_add(Ui *ui)
{
Evas_Object *win, *content, *tbl, *bx, *fr;
Evas_Object *genlist, *pb;
Evas_Object *ic;
power_t power;
- Evas_Coord x = 0, y = 0;
int j = 0, i = 0;
if (ui->sensors.win)
@@ -392,14 +391,7 @@ ui_win_sensors_add(Ui *ui, Evas_Object *parent)
if (ui->sensors.x > 0 && ui->sensors.y > 0)
evas_object_move(win, ui->sensors.x, ui->sensors.y);
else
- {
- if (parent)
- evas_object_geometry_get(parent, &x, &y, NULL, NULL);
- if (x > 0 && y > 0)
- evas_object_move(win, x + 20, y + 20);
- else
- elm_win_center(win, 1, 1);
- }
+ elm_win_center(win, 1, 1);
evas_object_show(win);
diff --git a/src/bin/ui/ui_sensors.h b/src/bin/ui/ui_sensors.h
index d70f2b1..de5634e 100644
--- a/src/bin/ui/ui_sensors.h
+++ b/src/bin/ui/ui_sensors.h
@@ -5,6 +5,6 @@
#include "../system/machine.h"
void
-ui_win_sensors_add(Ui *ui, Evas_Object *parent);
+ui_win_sensors_add(Ui *ui);
#endif
--
