hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=bdc865a84c9b23b1da2474abcd7735cb92d12287
commit bdc865a84c9b23b1da2474abcd7735cb92d12287 Author: ChunEon Park <[email protected]> Date: Sat Jul 19 16:03:46 2014 +0900 dummy_obj - update properly when the swallow part is changed. --- src/bin/dummy_obj.c | 28 ++++++++++------------------ src/bin/edj_viewer.c | 1 + 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/src/bin/dummy_obj.c b/src/bin/dummy_obj.c index 93d52c0..fb3379a 100644 --- a/src/bin/dummy_obj.c +++ b/src/bin/dummy_obj.c @@ -94,32 +94,28 @@ animator_cb(void *data) } static void -edje_change_file_cb(void *data, Evas_Object *obj EINA_UNUSED, - const char *emission EINA_UNUSED, - const char *source EINA_UNUSED) -{ - dummy_obj *dummy = data; - dummy_objs_update(dummy); -} - -static void layout_del_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { dummy_obj_del(obj); } -void dummy_obj_new(Evas_Object *layout) +void +dummy_obj_update(Evas_Object *layout) +{ + dummy_obj *dummy = evas_object_data_get(layout, DUMMYOBJ); + if (!dummy) return; + dummy_objs_update(dummy); +} + +void +dummy_obj_new(Evas_Object *layout) { dummy_obj *dummy = evas_object_data_get(layout, DUMMYOBJ); if (dummy) return; dummy = calloc(1, sizeof(dummy_obj)); - edje_object_signal_callback_add(layout, - "edje,change,file", "edje", - edje_change_file_cb, dummy); - Ecore_Animator *animator = ecore_animator_add(animator_cb, dummy); evas_object_data_set(layout, DUMMYOBJ, dummy); @@ -148,8 +144,4 @@ void dummy_obj_del(Evas_Object *layout) evas_object_data_set(layout, DUMMYOBJ, NULL); evas_object_event_callback_del(layout, EVAS_CALLBACK_DEL, layout_del_cb); - edje_object_signal_callback_del(layout, - "edje,change,file", "edje", - edje_change_file_cb); - } diff --git a/src/bin/edj_viewer.c b/src/bin/edj_viewer.c index 1b377bc..a57748c 100644 --- a/src/bin/edj_viewer.c +++ b/src/bin/edj_viewer.c @@ -159,6 +159,7 @@ edj_changed_cb(void *data, int type EINA_UNUSED, void *event) view_obj_min_update(vd->layout); view_part_highlight_set(vd, vd->part_name); + dummy_obj_update(vd->layout); return ECORE_CALLBACK_DONE; } --
