[EGIT] [apps/evisum] master 01/01: fields: small icons as buttons...

[Alastair Poole]

netstar pushed a commit to branch master.

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

commit 1bd7c79f0248fd3526308152b809be7681f4cb80
Author: Alastair Poole <nets...@gmail.com>
Date:   Sat Apr 3 08:44:00 2021 +0100

    fields: small icons as buttons...
---
 data/images/apply.png        | Bin 0 -> 3137 bytes
 data/images/meson.build      |   1 +
 src/bin/ui/ui_process_list.c |  22 ++++++++++++----------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/data/images/apply.png b/data/images/apply.png
new file mode 100644
index 0000000..5e300b3
Binary files /dev/null and b/data/images/apply.png differ
diff --git a/data/images/meson.build b/data/images/meson.build
index 57d80b7..c4500ac 100644
--- a/data/images/meson.build
+++ b/data/images/meson.build
@@ -9,4 +9,5 @@ install_data('go-up.png', 'go-down.png',
              'menu.png','lovethisdogharvey.png', 'application.png',
              'e.png', 'freebsd.png', 'linux.png', 'on.png', 'off.png',
              'proc.png', 'manual.png', 'actions.png', 'threads.png',
+             'apply.png',
              install_dir: join_paths(dir_data, 'evisum/images'))
diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c
index 8c0534c..5cb5d80 100644
--- a/src/bin/ui/ui_process_list.c
+++ b/src/bin/ui/ui_process_list.c
@@ -105,7 +105,6 @@ typedef struct
 } Win_Data;
 
 static Win_Data *_wd = NULL;
-static void _content_reset(Win_Data *wd);
 
 typedef struct
 {
@@ -117,6 +116,8 @@ typedef struct
 
 static Field _fields[PROC_FIELD_MAX];
 
+static void _content_reset(Win_Data *wd);
+
 static const char *
 _field_desc(Proc_Field id)
 {
@@ -280,7 +281,7 @@ _field_menu_apply_clicked_cb(void *data, Evas_Object *obj 
EINA_UNUSED, void *eve
           {
              elm_object_signal_emit(wd->indicator, "fields,change", 
"evisum/indicator");
           }
-      _content_reset(wd);
+        _content_reset(wd);
      }
    wd->fields_menu = NULL;
 }
@@ -288,7 +289,7 @@ _field_menu_apply_clicked_cb(void *data, Evas_Object *obj 
EINA_UNUSED, void *eve
 static Evas_Object *
 _field_menu_create(Win_Data *wd, Evas_Object *parent)
 {
-   Evas_Object *o, *fr, *hbx, *pad, *ic, *btn, *bx, *ck;
+   Evas_Object *o, *fr, *hbx, *pad, *ic, *bx, *ck;
 
    fr = elm_frame_add(parent);
    elm_object_style_set(fr, "pad_small");
@@ -311,12 +312,19 @@ _field_menu_create(Win_Data *wd, Evas_Object *parent)
    elm_box_pack_end(hbx, pad);
    evas_object_show(pad);
 
+   ic = elm_icon_add(parent);
+   elm_icon_standard_set(ic, evisum_icon_path_get("apply"));
+   evas_object_size_hint_min_set(ic, ELM_SCALE_SIZE(16), ELM_SCALE_SIZE(16));
+   evas_object_show(ic);
+   elm_box_pack_end(hbx, ic);
+   evas_object_smart_callback_add(ic, "clicked", _field_menu_apply_clicked_cb, 
wd);
+
    ic = elm_icon_add(parent);
    elm_icon_standard_set(ic, evisum_icon_path_get("exit"));
    evas_object_size_hint_min_set(ic, ELM_SCALE_SIZE(16), ELM_SCALE_SIZE(16));
-   evas_object_smart_callback_add(ic, "clicked", _field_menu_close_clicked_cb, 
wd);
    evas_object_show(ic);
    elm_box_pack_end(hbx, ic);
+   evas_object_smart_callback_add(ic, "clicked", _field_menu_close_clicked_cb, 
wd);
 
    elm_box_pack_end(bx, hbx);
    evas_object_show(hbx);
@@ -334,12 +342,6 @@ _field_menu_create(Win_Data *wd, Evas_Object *parent)
         evas_object_show(ck);
      }
 
-   btn = elm_button_add(parent);
-   elm_object_text_set(btn, _("Apply"));
-   elm_box_pack_end(bx, btn);
-   evas_object_show(btn);
-   evas_object_smart_callback_add(btn, "clicked", 
_field_menu_apply_clicked_cb, wd);
-
    o = elm_ctxpopup_add(parent);
    evas_object_size_hint_weight_set(o, EXPAND, EXPAND);
    evas_object_size_hint_align_set(o, FILL, FILL);

--