summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSangHyeon Jade Lee <sh10233.lee@samsung.com>2018-08-17 16:54:34 +0900
committerSangHyeon Jade Lee <sh10233.lee@samsung.com>2018-08-17 16:54:34 +0900
commit1ee844c2aec36eed4df29a190acc1b31abd25064 (patch)
tree1c704d10f193a3547698b1353b526f17f4bf77c3
parente6150da6f356c0e98e061eb44f97d685d8011950 (diff)
efl_ui_grid : add grid invalidatedevs/sanghyeonlee/efl_ui_grid
-rw-r--r--src/lib/elementary/efl_ui_grid.c18
-rw-r--r--src/lib/elementary/efl_ui_grid.eo1
2 files changed, 13 insertions, 6 deletions
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 08827a53d0..684d568d11 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -627,8 +627,9 @@ _efl_ui_grid_efl_object_finalize(Eo *obj,
627 return obj; 627 return obj;
628} 628}
629 629
630
630EOLIAN static void 631EOLIAN static void
631_efl_ui_grid_efl_object_destructor(Eo *obj, Efl_Ui_Grid_Data *pd) 632_efl_ui_grid_efl_object_invalidate(Eo *obj, Efl_Ui_Grid_Data *pd)
632{ 633{
633 _scroll_edje_object_detach(obj); 634 _scroll_edje_object_detach(obj);
634 635
@@ -648,16 +649,21 @@ _efl_ui_grid_efl_object_destructor(Eo *obj, Efl_Ui_Grid_Data *pd)
648 _efl_ui_grid_pan_resized_cb, obj); 649 _efl_ui_grid_pan_resized_cb, obj);
649 efl_event_callback_del(pd->content, EFL_GFX_ENTITY_EVENT_MOVE, 650 efl_event_callback_del(pd->content, EFL_GFX_ENTITY_EVENT_MOVE,
650 _efl_ui_grid_content_moved_cb, obj); 651 _efl_ui_grid_content_moved_cb, obj);
651
652 _grid_clear_internal(obj, pd); 652 _grid_clear_internal(obj, pd);
653 653
654 efl_content_set(pd->pan, NULL); 654 if (pd->smanager) efl_del(pd->smanager);
655 efl_del(pd->content); 655 pd->smanager = NULL;
656 if (pd->content) efl_del(pd->content);
656 pd->content = NULL; 657 pd->content = NULL;
657 efl_del(pd->pan); 658 if (pd->pan) efl_del(pd->pan);
658 pd->pan = NULL; 659 pd->pan = NULL;
659 pd->smanager = NULL;
660 660
661 efl_invalidate(efl_super(obj, MY_CLASS));
662}
663
664EOLIAN static void
665_efl_ui_grid_efl_object_destructor(Eo *obj, Efl_Ui_Grid_Data *pd)
666{
661 efl_destructor(efl_super(obj, MY_CLASS)); 667 efl_destructor(efl_super(obj, MY_CLASS));
662} 668}
663 669
diff --git a/src/lib/elementary/efl_ui_grid.eo b/src/lib/elementary/efl_ui_grid.eo
index 281b09aaea..f369b0de3c 100644
--- a/src/lib/elementary/efl_ui_grid.eo
+++ b/src/lib/elementary/efl_ui_grid.eo
@@ -52,6 +52,7 @@ class Efl.Ui.Grid (Efl.Ui.Layout.Object,
52 Efl.Object.constructor; 52 Efl.Object.constructor;
53 Efl.Object.finalize; 53 Efl.Object.finalize;
54 Efl.Object.destructor; 54 Efl.Object.destructor;
55 Efl.Object.invalidate;
55 56
56 //Efl.Canvas 57 //Efl.Canvas
57 Efl.Canvas.Group.group_calculate; 58 Efl.Canvas.Group.group_calculate;