From cd8253b902be58d14b07d6ce9bcd1b919aa6721e Mon Sep 17 00:00:00 2001
From: Alastair Poole <netstar@gmail.com>
Date: Fri, 12 Mar 2021 21:09:08 +0000
Subject: [PATCH] theme: thing

---
 data/themes/evisum.edc       | 91 ++++++++++++++++++++----------------
 src/bin/ui/ui_cpu.c          |  2 +-
 src/bin/ui/ui_process_list.c | 11 +++--
 3 files changed, 60 insertions(+), 44 deletions(-)

diff --git a/data/themes/evisum.edc b/data/themes/evisum.edc
index 89ea43e..fbb9cb8 100644
--- a/data/themes/evisum.edc
+++ b/data/themes/evisum.edc
@@ -27,7 +27,7 @@ group { \
 collections {
     group
     {
-        name: "evisum";
+        name: "cpu";
         parts
         {
             part
@@ -37,6 +37,7 @@ collections {
                 description
                 {
                    state: "default" 0.0;
+                   align: 0.0 0.0;
                    visible: 0;
                    color: 255 255 255 0;
                 }
@@ -54,6 +55,7 @@ collections {
                 description
                 {
                     clip_to: "evisum/menu-clip";
+                    max: 32 32;
                     state: "default" 0.0;
                     visible: 1;
                 }
@@ -64,44 +66,6 @@ collections {
                     visible: 1;
                 }
             }
-            part
-            {
-                name: "evisum/indicator-clip";
-                type: RECT;
-                description
-                {
-                   state: "default" 0.0;
-                   min: 128 128;
-                   max: 128 128;
-                   visible: 0;
-                   color: 255 255 255 0;
-                }
-                description
-                {
-                   inherit: "default";
-                   state: "visible" 0.0;
-                   visible: 1;
-                   color: 255 255 255 255;
-                }
-            }
-            part
-            {
-                name: "evisum/indicator";
-                type: SWALLOW;
-                description
-                {
-                    aspect: 1.0 1.0; aspect_preference: BOTH;
-                    clip_to: "evisum/indicator-clip";
-                    state: "default" 0.0;
-                    visible: 1;
-                }
-                description
-                {
-                    clip_to: "evisum/indicator-clip";
-                    state: "visible" 0.0;
-                    visible: 1;
-                }
-            }
         }
         programs
         {
@@ -121,6 +85,55 @@ collections {
                 transition: SINUSOIDAL 0.5;
                 target: "evisum/menu-clip";
             }
+        }
+    }
+
+    group
+    {
+       name: "proc";
+       parts
+       {
+            part
+            {
+                name: "evisum/indicator-clip";
+                type: RECT;
+                description
+                {
+                   state: "default" 0.0;
+                   visible: 0;
+                   min: 256 256;
+                   color: 255 255 255 0;
+                }
+                description
+                {
+                   inherit: "default";
+                   state: "visible" 0.0;
+                   visible: 1;
+                   color: 255 255 255 255;
+                }
+            }
+            part
+            {
+                name: "evisum/indicator";
+                type: SWALLOW;
+                description
+                {
+                    clip_to: "evisum/indicator-clip";
+                    aspect: 1.0 1.0; aspect_preference: BOTH;
+                    state: "default" 0.0;
+                    visible: 1;
+                }
+                description
+                {
+                    inherit: "default";
+                    clip_to: "evisum/indicator-clip";
+                    state: "visible" 0.0;
+                    visible: 1;
+                }
+            }
+        }
+        programs
+        {
             program
             {
                 signal: "indicator,show";
diff --git a/src/bin/ui/ui_cpu.c b/src/bin/ui/ui_cpu.c
index dcc7502..d01fda6 100644
--- a/src/bin/ui/ui_cpu.c
+++ b/src/bin/ui/ui_cpu.c
@@ -625,7 +625,7 @@ _graph(Evisum_Ui *ui, Evas_Object *parent)
    ad->btn_menu = lay = elm_layout_add(parent);
    evas_object_size_hint_weight_set(lay, 1.0, 1.0);
    evas_object_size_hint_align_set(lay, 0.99, 0.01);
-   elm_layout_file_set(lay, PACKAGE_DATA_DIR "/themes/evisum.edj", "evisum");
+   elm_layout_file_set(lay, PACKAGE_DATA_DIR "/themes/evisum.edj", "cpu");
    elm_layout_content_set(lay, "evisum/menu", btn);
    elm_table_pack(tbl, lay, 0, 0, 5, ad->cpu_count);
    evas_object_show(lay);
diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c
index ab0a7c0..0bade60 100644
--- a/src/bin/ui/ui_process_list.c
+++ b/src/bin/ui/ui_process_list.c
@@ -1966,7 +1966,10 @@ _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 
    evas_object_geometry_get(obj, NULL, NULL,
                             &ui->proc.width, &ui->proc.height);
-   evas_object_move(pd->indicator, 32, ui->proc.height - 32);
+
+   if (!evisum_ui_effects_enabled_get(ui)) return;
+   evas_object_move(pd->indicator, ui->proc.width - 32, ui->proc.height - 32);
+   evas_object_show(pd->indicator);
 }
 
 static void
@@ -2103,7 +2106,7 @@ _effects_add(Data *pd, Evas_Object *win)
         evas_object_show(pb);
 
         pd->indicator = lay = elm_layout_add(win);
-        elm_layout_file_set(lay, PACKAGE_DATA_DIR"/themes/evisum.edj", "evisum");
+        elm_layout_file_set(lay, PACKAGE_DATA_DIR"/themes/evisum.edj", "proc");
         elm_layout_content_set(lay, "evisum/indicator", pb);
         evas_object_show(lay);
      }
@@ -2174,9 +2177,7 @@ ui_process_list_win_add(Evisum_Ui *ui)
      elm_win_center(win, 1, 1);
 
    pd->tb_content = tb = _content_add(pd, win);
-   _content_reset(pd);
    elm_object_content_set(win, tb);
-   _search_add(pd);
 
    pd->cache = evisum_ui_item_cache_new(pd->glist, _item_create, 40);
    pd->cpu_times = eina_hash_int64_new(_cpu_times_free_cb);
@@ -2190,7 +2191,9 @@ ui_process_list_win_add(Evisum_Ui *ui)
    evas_object_event_callback_add(tb, EVAS_CALLBACK_KEY_DOWN,
                                   _win_key_down_cb, pd);
 
+   _search_add(pd);
    _effects_add(pd, win);
+   _content_reset(pd);
 
    _win_resize_cb(pd, NULL, win, NULL);
    pd->thread = ecore_thread_feedback_run(_process_list,