[EGIT] [core/enlightenment] master 01/01: tasks/ibar: Use correct struct members for geom.

[Alastair Poole]

netstar pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=ffbb8464f209ce3a9bf7de3428eacf37e1d81f14

commit ffbb8464f209ce3a9bf7de3428eacf37e1d81f14
Author: Alastair Poole <nets...@gmail.com>
Date:   Wed Aug 19 11:53:16 2020 +0100

    tasks/ibar: Use correct struct members for geom.
    
    Oops :)
---
 src/modules/ibox/e_mod_main.c  |  5 +++--
 src/modules/tasks/e_mod_main.c | 24 +++++++++++++-----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c
index 5953e6bab..d8d88a899 100644
--- a/src/modules/ibox/e_mod_main.c
+++ b/src/modules/ibox/e_mod_main.c
@@ -832,8 +832,9 @@ _ibox_cb_icon_mouse_move(void *data, Evas *e EINA_UNUSED, 
Evas_Object *obj EINA_
                o = e_client_icon_add(ic->client, e_drag_evas_get(d));
              else
                {
-                  o = e_comp_object_util_mirror_add(ic->client->frame);
-                  evas_object_size_hint_aspect_set(o, 
EVAS_ASPECT_CONTROL_BOTH, ic->client->w, ic->client->h);
+                  E_Client *ec = ic->client;
+                  o = e_comp_object_util_mirror_add(ec->frame);
+                  evas_object_size_hint_aspect_set(o, 
EVAS_ASPECT_CONTROL_BOTH, ec->client.w, ec->client.h);
                   evas_object_size_hint_max_set(o, w, h);
                }
              e_drag_object_set(d, o);
diff --git a/src/modules/tasks/e_mod_main.c b/src/modules/tasks/e_mod_main.c
index 00e30a853..a669d6021 100644
--- a/src/modules/tasks/e_mod_main.c
+++ b/src/modules/tasks/e_mod_main.c
@@ -872,6 +872,7 @@ _tasks_cb_timer_del(void *data)
 static void
 _tasks_item_preview_add(Tasks_Item *item)
 {
+   E_Client *ec;
    Evas_Object *o, *ot, *or, *img;
    Evas_Coord ox, oy, ow, oh, size;
    double n;
@@ -889,26 +890,27 @@ _tasks_item_preview_add(Tasks_Item *item)
    elm_object_content_set(o, ot);
    evas_object_show(ot);
 
-   img = e_comp_object_util_mirror_add(item->client->frame);
-   evas_object_size_hint_aspect_set(img, EVAS_ASPECT_CONTROL_BOTH, 
item->client->w, item->client->h);
+   ec = item->client;
+   img = e_comp_object_util_mirror_add(ec->frame);
+   evas_object_size_hint_aspect_set(img, EVAS_ASPECT_CONTROL_BOTH, 
ec->client.w, ec->client.h);
    evas_object_show(img);
 
    or = evas_object_rectangle_add(evas_object_evas_get(o));
 
    size = item->tasks->config->preview_size;
-   if (item->client->w > item->client->h)
+   if (ec->client.w > ec->client.h)
      {
-        n = size * (1.0 / item->client->w);
-        evas_object_size_hint_min_set(img, size, n * item->client->h);
-        evas_object_size_hint_max_set(img, size, n * item->client->h);
-        evas_object_size_hint_min_set(or,  size + 1, (n * item->client->h) + 
1);
+        n = size * (1.0 / ec->client.w);
+        evas_object_size_hint_min_set(img, size, n * ec->client.h);
+        evas_object_size_hint_max_set(img, size, n * ec->client.h);
+        evas_object_size_hint_min_set(or,  size + 1, (n * ec->client.h) + 1);
      }
    else
      {
-        n = size * (1.0 / item->client->h);
-        evas_object_size_hint_min_set(img, n * item->client->w, size);
-        evas_object_size_hint_max_set(img, n * item->client->w, size);
-        evas_object_size_hint_min_set(or, (n * item->client->w) + 1, size + 1);
+        n = size * (1.0 / ec->client.h);
+        evas_object_size_hint_min_set(img, n * ec->client.w, size);
+        evas_object_size_hint_max_set(img, n * ec->client.w, size);
+        evas_object_size_hint_min_set(or, (n * ec->client.w) + 1, size + 1);
      }
 
    elm_table_pack(ot, or, 0, 0, 1, 1);

--