netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=380f105a1186b297ae46b7d105b89917e96648c6
commit 380f105a1186b297ae46b7d105b89917e96648c6
Author: Alastair Poole <nets...@gmail.com>
Date: Wed Mar 10 17:54:26 2021 +0000
change: small
---
src/bin/ui/ui_cpu.c | 24 ++++++++++++------------
src/bin/ui/ui_disk.c | 4 ++--
src/bin/ui/ui_memory.c | 4 ++--
src/bin/ui/ui_network.c | 4 ++--
src/bin/ui/ui_process_list.c | 2 +-
src/bin/ui/ui_sensors.c | 4 ++--
src/bin/ui/ui_util.c | 1 +
7 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/bin/ui/ui_cpu.c b/src/bin/ui/ui_cpu.c
index 8e1675c..2cf6b19 100644
--- a/src/bin/ui/ui_cpu.c
+++ b/src/bin/ui/ui_cpu.c
@@ -779,7 +779,7 @@ void
ui_cpu_win_add(Ui *ui)
{
Animate *ad;
- Evas_Object *win, *box, *scroller;
+ Evas_Object *win, *box, *scr;
if (ui->cpu.win)
{
@@ -798,12 +798,12 @@ ui_cpu_win_add(Ui *ui)
evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE,
_win_resize_cb, ui);
- scroller = elm_scroller_add(win);
- evas_object_size_hint_weight_set(scroller, EXPAND, EXPAND);
- evas_object_size_hint_align_set(scroller, FILL, FILL);
- elm_scroller_policy_set(scroller,
+ scr = elm_scroller_add(win);
+ evas_object_size_hint_weight_set(scr, EXPAND, EXPAND);
+ evas_object_size_hint_align_set(scr, FILL, FILL);
+ elm_scroller_policy_set(scr,
ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
- evas_object_show(scroller);
+ evas_object_show(scr);
box = elm_box_add(win);
evas_object_size_hint_align_set(box, FILL, FILL);
@@ -811,17 +811,17 @@ ui_cpu_win_add(Ui *ui)
evas_object_show(box);
ad = _graph(ui, box);
- evas_object_event_callback_add(scroller, EVAS_CALLBACK_KEY_DOWN,
_win_key_down_cb, ad);
- evas_object_event_callback_add(scroller, EVAS_CALLBACK_MOUSE_MOVE,
_win_mouse_move_cb, ad);
- elm_object_content_set(scroller, box);
- elm_object_content_set(win, scroller);
+ evas_object_event_callback_add(scr, EVAS_CALLBACK_KEY_DOWN,
_win_key_down_cb, ad);
+ evas_object_event_callback_add(scr, EVAS_CALLBACK_MOUSE_MOVE,
_win_mouse_move_cb, ad);
+ elm_object_content_set(scr, box);
+ elm_object_content_set(win, scr);
- if (ui->cpu.width > 0 && ui->cpu.height > 0)
+ if ((ui->cpu.width > 0) && (ui->cpu.height > 0))
evas_object_resize(win, ui->cpu.width, ui->cpu.height);
else
evas_object_resize(win, UI_CHILD_WIN_WIDTH * 1.5, UI_CHILD_WIN_HEIGHT *
1.1);
- if (ui->cpu.x > 0 && ui->cpu.y > 0)
+ if ((ui->cpu.x > 0) && (ui->cpu.y > 0))
evas_object_move(win, ui->cpu.x, ui->cpu.y);
else
elm_win_center(win, 1, 1);
diff --git a/src/bin/ui/ui_disk.c b/src/bin/ui/ui_disk.c
index 4e92c07..61401b8 100644
--- a/src/bin/ui/ui_disk.c
+++ b/src/bin/ui/ui_disk.c
@@ -676,12 +676,12 @@ ui_disk_win_add(Ui *ui)
elm_table_pack(tb, scr, 0, 2, 8, 2);
elm_object_content_set(win, tb);
- if (ui->disk.width > 0 && ui->disk.height > 0)
+ if ((ui->disk.width > 0) && (ui->disk.height > 0))
evas_object_resize(win, ui->disk.width, ui->disk.height);
else
evas_object_resize(win, UI_CHILD_WIN_WIDTH * 1.5, UI_CHILD_WIN_HEIGHT *
1.1);
- if (ui->disk.x > 0 && ui->disk.y > 0)
+ if ((ui->disk.x > 0) && (ui->disk.y > 0))
evas_object_move(win, ui->disk.x, ui->disk.y);
else
elm_win_center(win, 1, 1);
diff --git a/src/bin/ui/ui_memory.c b/src/bin/ui/ui_memory.c
index ccf4f1e..f3f5105 100644
--- a/src/bin/ui/ui_memory.c
+++ b/src/bin/ui/ui_memory.c
@@ -287,12 +287,12 @@ ui_mem_win_add(Ui *ui)
elm_table_pack(tb, pb, 2, 6 + i, 1, 1);
}
- if (ui->mem.width > 0 && ui->mem.height > 0)
+ if ((ui->mem.width > 0) && (ui->mem.height > 0))
evas_object_resize(win, ui->mem.width, ui->mem.height);
else
evas_object_resize(win, UI_CHILD_WIN_WIDTH , UI_CHILD_WIN_HEIGHT);
- if (ui->mem.x > 0 && ui->mem.y > 0)
+ if ((ui->mem.x > 0) && (ui->mem.y > 0))
evas_object_move(win, ui->mem.x, ui->mem.y);
else
elm_win_center(win, 1, 1);
diff --git a/src/bin/ui/ui_network.c b/src/bin/ui/ui_network.c
index b07ad32..4d30b32 100644
--- a/src/bin/ui/ui_network.c
+++ b/src/bin/ui/ui_network.c
@@ -378,12 +378,12 @@ ui_network_win_add(Ui *ui)
elm_object_content_set(win, bx);
- if (ui->network.width > 0 && ui->network.height > 0)
+ if ((ui->network.width) > 0 && (ui->network.height > 0))
evas_object_resize(win, ui->network.width, ui->network.height);
else
evas_object_resize(win, UI_CHILD_WIN_WIDTH, UI_CHILD_WIN_HEIGHT);
- if (ui->network.x > 0 && ui->network.y > 0)
+ if ((ui->network.x > 0) && (ui->network.y > 0))
evas_object_move(win, ui->network.x, ui->network.y);
else
elm_win_center(win, 1, 1);
diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c
index 9596068..8a76dcd 100644
--- a/src/bin/ui/ui_process_list.c
+++ b/src/bin/ui/ui_process_list.c
@@ -2139,7 +2139,7 @@ ui_process_list_win_add(Ui *ui)
evas_object_resize(win, EVISUM_WIN_WIDTH * elm_config_scale_get(),
EVISUM_WIN_HEIGHT * elm_config_scale_get());
- if ((ui->proc.x) > 0 && (ui->proc.y > 0))
+ if ((ui->proc.x > 0) && (ui->proc.y > 0))
evas_object_move(win, ui->proc.x, ui->proc.y);
else
elm_win_center(win, 1, 1);
diff --git a/src/bin/ui/ui_sensors.c b/src/bin/ui/ui_sensors.c
index d145750..d0e66fc 100644
--- a/src/bin/ui/ui_sensors.c
+++ b/src/bin/ui/ui_sensors.c
@@ -369,12 +369,12 @@ ui_sensors_win_add(Ui *ui)
pd->itc->func.filter_get = NULL;
pd->itc->func.del = _item_del;
- if (ui->sensors.width > 0 && ui->sensors.height > 0)
+ if ((ui->sensors.width > 0) && (ui->sensors.height > 0))
evas_object_resize(win, ui->sensors.width, ui->sensors.height);
else
evas_object_resize(win, UI_CHILD_WIN_WIDTH, UI_CHILD_WIN_HEIGHT);
- if (ui->sensors.x > 0 && ui->sensors.y > 0)
+ if ((ui->sensors.x > 0) && (ui->sensors.y > 0))
evas_object_move(win, ui->sensors.x, ui->sensors.y);
else
elm_win_center(win, 1, 1);
diff --git a/src/bin/ui/ui_util.c b/src/bin/ui/ui_util.c
index b3da3a3..a3fc5b8 100644
--- a/src/bin/ui/ui_util.c
+++ b/src/bin/ui/ui_util.c
@@ -465,6 +465,7 @@ evisum_about_window_show(void *data)
evas_object_size_hint_weight_set(lb, EXPAND, EXPAND);
evas_object_size_hint_align_set(lb, FILL, FILL);
elm_entry_single_line_set(lb, 0);
+ elm_object_focus_allow_set(lb, 0);
elm_entry_scrollable_set(lb, 0);
elm_entry_editable_set(lb, 0);
elm_entry_select_allow_set(lb, 0);
--
