[EGIT] [tools/erigo] master 03/03: Fix parsing and generation of content section for Grid widget

[Yakov Goldberg]

yakov pushed a commit to branch master.

http://git.enlightenment.org/tools/erigo.git/commit/?id=9ac0368999024e76766862f782ad06cc014e89e2

commit 9ac0368999024e76766862f782ad06cc014e89e2
Author: Yakov Goldberg <yako...@samsung.com>
Date:   Tue Aug 11 17:49:10 2015 +0300

    Fix parsing and generation of content section for Grid widget
---
 src/lib/gui_parser.c     | 13 +++++++++++--
 src/lib/json_generator.c |  3 ++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/lib/gui_parser.c b/src/lib/gui_parser.c
index b7cca5c..68146c6 100644
--- a/src/lib/gui_parser.c
+++ b/src/lib/gui_parser.c
@@ -599,9 +599,18 @@ _widget_parse(Gui_Context *gui_ctx, Eid *eid, 
Eina_Json_Value *widget_js, const
                   eina_iterator_free(it);
                }
           }
-        if (wdg_is_container(wdg, DB_DEF_TABLE_CLASS))
+        if (wdg_is_container(wdg, DB_DEF_TABLE_CLASS) ||
+            wdg_is_container(wdg, DB_DEF_GRID_CLASS))
           {
-             const Op_Desc *op_desc = 
db_container_desc_op_desc_get(db_container_desc_get(DB_DEF_TABLE_CLASS), 
CONTAINER_PACK);
+             const Op_Desc *op_desc = NULL;
+             if (wdg_is_container(wdg, DB_DEF_TABLE_CLASS))
+               {
+                  op_desc = 
db_container_desc_op_desc_get(db_container_desc_get(DB_DEF_TABLE_CLASS), 
CONTAINER_PACK);
+               }
+             else if (wdg_is_container(wdg, DB_DEF_GRID_CLASS))
+               {
+                  op_desc = 
db_container_desc_op_desc_get(db_container_desc_get(DB_DEF_GRID_CLASS), 
CONTAINER_PACK);
+               }
              if (!op_desc)
                {
                   ERR("Cannot find op description: CONTAINER_PACK for class: 
\"%s\"\n", class_name);
diff --git a/src/lib/json_generator.c b/src/lib/json_generator.c
index a64cd18..71b7419 100644
--- a/src/lib/json_generator.c
+++ b/src/lib/json_generator.c
@@ -496,7 +496,8 @@ _widget_json_generate(Gui_Widget *wdg)
              if (arr) eina_json_object_append(obj, "Contains", arr);
           }
         if (wdg_obj_container_class_name_get(wdg) &&
-           !strcmp(wdg_obj_container_class_name_get(wdg), DB_DEF_TABLE_CLASS))
+           (!strcmp(wdg_obj_container_class_name_get(wdg), DB_DEF_TABLE_CLASS) 
||
+            !strcmp(wdg_obj_container_class_name_get(wdg), DB_DEF_GRID_CLASS)))
           {
              const Eina_List *items_lst = 
wdg_obj_container_contents_list_get(wdg);
              Eina_Json_Value *subobjs = NULL;

--