rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=8043a48f4400804a5e7b1f32916f130a21891c9e
commit 8043a48f4400804a5e7b1f32916f130a21891c9e Author: Vitalii Vorobiov <[email protected]> Date: Thu Jan 14 15:50:52 2016 +0000 demo_group: update all changed swallow and text parts when mode switch back --- src/bin/ui/demo_group.c | 21 +++++++++++++++++++++ src/bin/ui/demo_group.h | 6 ++++++ .../ui/live_view/elementary/live_custom_layout.c | 1 - src/bin/ui/workspace/workspace.c | 1 + 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/bin/ui/demo_group.c b/src/bin/ui/demo_group.c index 1cd262c..8e75bc1 100644 --- a/src/bin/ui/demo_group.c +++ b/src/bin/ui/demo_group.c @@ -477,3 +477,24 @@ demo_group_part_del(Evas_Object *demo, Part *part) } } } + +void +demo_group_demo_update(Evas_Object *demo) +{ + Part_Demo_List *pl = evas_object_data_get(demo, DEMO_GROUP_DATA); + Demo_Part *part; + Eina_List *l; + + assert(pl); + + EINA_LIST_FOREACH(pl->text_list, l, part) + { + evas_object_smart_callback_call(ap.win, SIGNAL_DEMO_TEXT_SET, part); + } + EINA_LIST_FOREACH(pl->swallow_list, l, part) + { + if (part->object) + part->change = true; + evas_object_smart_callback_call(ap.win, SIGNAL_DEMO_SWALLOW_SET, part); + } +} diff --git a/src/bin/ui/demo_group.h b/src/bin/ui/demo_group.h index be80f16..84720d4 100644 --- a/src/bin/ui/demo_group.h +++ b/src/bin/ui/demo_group.h @@ -113,4 +113,10 @@ demo_group_part_add(Evas_Object *demo, Part *part); void demo_group_part_del(Evas_Object *demo, Part *part); +/** + * @ingroup DemoGroup + */ +void +demo_group_demo_update(Evas_Object *demo); + #endif /* DEMO_GROUP_H */ diff --git a/src/bin/ui/live_view/elementary/live_custom_layout.c b/src/bin/ui/live_view/elementary/live_custom_layout.c index ec4f6b0..e722dd7 100644 --- a/src/bin/ui/live_view/elementary/live_custom_layout.c +++ b/src/bin/ui/live_view/elementary/live_custom_layout.c @@ -35,7 +35,6 @@ layout_custom_create(Evas_Object *parent, const Group *group) return NULL; } - TODO("DO swallow after text and signal (means free => SWALLOW_CLEAN_FUNC)") evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SWALLOW_SET, on_swallow_check, obj); evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_TEXT_SET, on_text_check, obj); evas_object_smart_callback_add(ap.win, SIGNAL_DEMO_SIGNAL_SEND, send_signal, obj); diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c index b13f3ad..03fff0d 100644 --- a/src/bin/ui/workspace/workspace.c +++ b/src/bin/ui/workspace/workspace.c @@ -998,6 +998,7 @@ _mode_changed(void *data, elm_object_part_content_set(sd->panes, "right", sd->demo_group); evas_object_show(sd->demo_group); + demo_group_demo_update(sd->demo_group); evas_object_smart_callback_call(ap.win, SIGNAL_DIFFERENT_TAB_CLICKED, NULL); break; --
