[EGIT] [efm2] 02/02: make custom icon sizes work

[Enlightenment Git]

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch master
in repository efm2.

View the commit online.

commit 6836357bed096827ec5c3bab8635ec411d60f9c7
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
AuthorDate: Tue Aug 22 09:16:09 2023 +0100

    make custom icon sizes work
---
 src/backends/default/open.c |  8 +++++++-
 src/efm/efm.c               |  7 ++-----
 src/efm/efm_back_end.c      | 13 ++++++++++++-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/backends/default/open.c b/src/backends/default/open.c
index 298cf2c..ba11475 100644
--- a/src/backends/default/open.c
+++ b/src/backends/default/open.c
@@ -680,7 +680,13 @@ _file_add_mod_info(Eina_Strbuf *strbuf, const char *path, Eina_Bool delay)
    s = meta_get(path, "xy");
    if (s)
      {
-        cmd_strbuf_append(strbuf, "xy", s);
+        cmd_strbuf_append(strbuf, "meta.xy", s);
+        eina_stringshare_del(s);
+     }
+   s = meta_get(path, "wh");
+   if (s)
+     {
+        cmd_strbuf_append(strbuf, "meta.wh", s);
         eina_stringshare_del(s);
      }
 
diff --git a/src/efm/efm.c b/src/efm/efm.c
index 3a6c29a..cca71ef 100644
--- a/src/efm/efm.c
+++ b/src/efm/efm.c
@@ -968,11 +968,8 @@ _relayout_icons(Smart_Data *sd)
           { // icon is at urrent x,y
              icon->geom.x = x;
              icon->geom.y = y;
-             if (icon->geom.w == -9999)
-               {
-                  icon->geom.w = sd->icon_min_w;
-                  icon->geom.h = sd->icon_min_h;
-               }
+             icon->geom.w = sd->icon_min_w;
+             icon->geom.h = sd->icon_min_h;
              x += icon->geom.w;
              if ((x + icon->geom.w) > sd->geom.w)
                { // if next icon over end of row, start a new row
diff --git a/src/efm/efm_back_end.c b/src/efm/efm_back_end.c
index 8f67d6e..a43b359 100644
--- a/src/efm/efm_back_end.c
+++ b/src/efm/efm_back_end.c
@@ -437,7 +437,7 @@ _cb_thread_notify(void *data, Ecore_Thread *th EINA_UNUSED, void *msg)
                eina_stringshare_replace((&icon->info.mime),
                                         "inode/file");
 
-             s = cmd_key_find(c, "xy");
+             s = cmd_key_find(c, "meta.xy");
              if (s)
                {
                   int x, y;
@@ -448,6 +448,17 @@ _cb_thread_notify(void *data, Ecore_Thread *th EINA_UNUSED, void *msg)
                        icon->geom.y = y;
                     }
                }
+             s = cmd_key_find(c, "meta.wh");
+             if (s)
+               {
+                  int w, h;
+
+                  if (sscanf(s, "%ix%i", &w, &h) == 2)
+                    {
+                       icon->geom.w = w;
+                       icon->geom.h = h;
+                    }
+               }
              for ( ; il; il = il->next)
                {
                   icon2 = il->data;


-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.