rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=6c9e2e250fba1255d60f4ed22dcbfb27c715a519
commit 6c9e2e250fba1255d60f4ed22dcbfb27c715a519
Author: Mykyta Biliavskyi <m.biliavs...@samsung.com>
Date: Wed Jan 18 09:09:33 2017 +0200
Images set view: correct processing for empty images set.
In case when images set doesn't contain any images - 0 will displayed in
bottom right cell.
---
src/bin/ui/image_manager.c | 2 +-
src/bin/ui/popup.c | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/bin/ui/image_manager.c b/src/bin/ui/image_manager.c
index a3c4ec3..779958e 100644
--- a/src/bin/ui/image_manager.c
+++ b/src/bin/ui/image_manager.c
@@ -82,7 +82,7 @@ _grid_label_get(void *data,
{
res = resource_manager_find(ap.project->RM.image_sets, it->image_name);
int count = eina_list_count(res->common.uses___);
- if (count <= 4) return strdup("");
+ if (count <= 4 && count > 0) return strdup("");
char buf[256];
snprintf(buf, 256, "%d", count);
return strdup(buf);
diff --git a/src/bin/ui/popup.c b/src/bin/ui/popup.c
index e506aa7..f18b7bd 100644
--- a/src/bin/ui/popup.c
+++ b/src/bin/ui/popup.c
@@ -805,10 +805,13 @@ _image_gengrid_init(Helper_Data *helper_data)
continue;
}
- it = (Item *)mem_malloc(sizeof(Item));
+ it = (Item *)mem_calloc(1, sizeof(Item));
it->image_name = eina_stringshare_add(image_set->common.name);
- res = eina_list_data_get(image_set->common.uses___);
- it->source = eina_stringshare_add(res->source);
+ if (image_set->common.uses___)
+ {
+ res = eina_list_data_get(image_set->common.uses___);
+ it->source = eina_stringshare_add(res->source);
+ }
it->type = IMAGE_SET;
elm_gengrid_item_append(helper_data->gengrid, gic_set, it, NULL, NULL);
}
@@ -832,7 +835,7 @@ _grid_label_get(void *data,
{
res = resource_manager_find(ap.project->RM.image_sets, it->image_name);
int count = eina_list_count(res->common.uses___);
- if (count <= 4) return strdup("");
+ if (count <= 4 && count > 0) return strdup("");
char buf[256];
snprintf(buf, 256, "%d", count);
return strdup(buf);
--
