[EGIT] [efm2] 01/03: shuffle list done to reblock if queued

[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 ac260f993e9413d82a8944dc1beff7f76a768ef8
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
AuthorDate: Tue Aug 22 09:41:57 2023 +0100

    shuffle list done to reblock if queued
---
 src/efm/efm.c         | 8 ++++++--
 src/efm/efm_custom.c  | 5 -----
 src/efm/efm_structs.h | 1 +
 src/efm/efm_util.c    | 5 +++++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/efm/efm.c b/src/efm/efm.c
index cca71ef..d6954d2 100644
--- a/src/efm/efm.c
+++ b/src/efm/efm.c
@@ -1012,8 +1012,12 @@ _listing_done(Smart_Data *sd)
    sd->listing_done = EINA_TRUE;
    if (sd->config.view_mode == EFM_VIEW_MODE_ICONS_CUSTOM)
      {
-        _icon_custom_data_all_icons_fill(sd);
-        _recalc(sd);
+        if (sd->reblock_job) sd->listing_done_reblock = EINA_TRUE;
+        else
+          {
+             _icon_custom_data_all_icons_fill(sd);
+             _recalc(sd);
+          }
      }
 }
 
diff --git a/src/efm/efm_custom.c b/src/efm/efm_custom.c
index 54d991b..19340df 100644
--- a/src/efm/efm_custom.c
+++ b/src/efm/efm_custom.c
@@ -155,11 +155,6 @@ _icon_custom_data_all_icons_fill(Smart_Data *sd)
    Block *block;
    Icon *icon;
 
-   if (sd->reblock_job)
-     {
-        ecore_job_del(sd->reblock_job);
-        _cb_reblock(sd);
-     }
    EINA_LIST_FOREACH(sd->blocks, bl, block)
      {
         EINA_LIST_FOREACH(block->icons, il, icon)
diff --git a/src/efm/efm_structs.h b/src/efm/efm_structs.h
index a5545a8..75fe215 100644
--- a/src/efm/efm_structs.h
+++ b/src/efm/efm_structs.h
@@ -98,6 +98,7 @@ struct _Smart_Data
    Eina_Bool             cnp_cut : 1;
    Eina_Bool             detail_down : 1;
    Eina_Bool             listing_done : 1;
+   Eina_Bool             listing_done_reblock : 1;
 
    struct {
       Efm_View_Mode      view_mode;
diff --git a/src/efm/efm_util.c b/src/efm/efm_util.c
index 5eda7ba..739274a 100644
--- a/src/efm/efm_util.c
+++ b/src/efm/efm_util.c
@@ -1465,6 +1465,11 @@ _cb_reblock(void *data)
    Block *block;
 
    sd->reblock_job = NULL;
+   if (sd->listing_done_reblock)
+     {
+        sd->listing_done_reblock = EINA_FALSE;
+        _listing_done(sd);
+     }
    // special - remove our blocks but leave icons realized as we rebuild
    // the block list next
    EINA_LIST_FREE(sd->blocks, block) _block_free_final(block);


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