rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=d1764b3e75a71f68d9177a6c748705c48167640e
commit d1764b3e75a71f68d9177a6c748705c48167640e Author: Vitalii Vorobiov <vi.vorob...@samsung.com> Date: Fri Jan 8 18:48:29 2016 +0000 live_widget_common: light refactor --- .../live_view/elementary/live_elementary_widgets.h | 11 +++ .../ui/live_view/elementary/live_widget_common.c | 89 ++++++++++++---------- 2 files changed, 60 insertions(+), 40 deletions(-) diff --git a/src/bin/ui/live_view/elementary/live_elementary_widgets.h b/src/bin/ui/live_view/elementary/live_elementary_widgets.h index 5b5483f..6437d55 100644 --- a/src/bin/ui/live_view/elementary/live_elementary_widgets.h +++ b/src/bin/ui/live_view/elementary/live_elementary_widgets.h @@ -34,6 +34,17 @@ #include "widget_macro.h" /** + * Common function that generate one object to set into demo's swallow. + * + * @param part demo part for setting object into. + * @param object parent for generated object. + * + * @ingroup Live_Elementary_Widgets + */ +Evas_Object * +object_generate(Demo_Part *part, Evas_Object *object); + +/** * Common Swallow callback that is used in most of simple widgets. * * @param data data from callback register. diff --git a/src/bin/ui/live_view/elementary/live_widget_common.c b/src/bin/ui/live_view/elementary/live_widget_common.c index 8c0f937..d77f73e 100644 --- a/src/bin/ui/live_view/elementary/live_widget_common.c +++ b/src/bin/ui/live_view/elementary/live_widget_common.c @@ -52,6 +52,54 @@ standard_widget_name_parse(const char *full_group_name, return true; } +Evas_Object * +object_generate(Demo_Part *part, Evas_Object *object) +{ + Evas_Object *content = NULL; + + int content_type = part->swallow_content; + int widget_type = part->widget; + + if (content_type == CONTENT_RECTANGLE) /* create rect */ + { + content = evas_object_rectangle_add(object); + } + else if ((content_type == CONTENT_IMAGE) && (part->image_path)) /* create picture */ + { + content = elm_image_add(object); + elm_image_file_set(content, part->image_path, NULL); + } + else if (content_type == CONTENT_WIDGET) /* create widget */ + { + switch (widget_type) + { + case WIDGET_BUTTON: + content = elm_button_add(object); + elm_object_text_set(content, _("User Text")); + break; + case WIDGET_CHECK: + content = elm_check_add(object); + elm_object_text_set(content, _("User Text")); + elm_check_state_set(content, true); + break; + case WIDGET_SLIDER: + content = elm_slider_add(object); + elm_slider_unit_format_set(content, "%1.2f units"); + elm_slider_indicator_format_set(content, "%1.2f"); + elm_slider_min_max_set(content, 0, 10); + break; + case WIDGET_ENTRY: + content = elm_entry_add(object); + elm_entry_single_line_set(content, false); + break; + case WIDGET_PROGRESSBAR: + content = elm_progressbar_add(object); + break; + } + } + return content; +} + void on_swallow_check(void *data, Evas_Object *obj __UNUSED__, @@ -62,7 +110,6 @@ on_swallow_check(void *data, Evas_Object *content = NULL; int content_type = part->swallow_content; - int widget_type = part->widget; if (part->change) { @@ -75,45 +122,7 @@ on_swallow_check(void *data, part->object = NULL; } - if (content_type == CONTENT_RECTANGLE) /* create rect */ - { - content = evas_object_rectangle_add(object); - } - else if ((content_type == CONTENT_IMAGE) && (part->image_path)) /* create picture */ - { - content = elm_image_add(object); - elm_image_file_set(content, part->image_path, NULL); - } - else if (content_type == CONTENT_WIDGET) /* create widget */ - { - switch (widget_type) - { - case WIDGET_BUTTON: - content = elm_button_add(object); - elm_object_text_set(content, _("User Text")); - break; - case WIDGET_CHECK: - content = elm_check_add(object); - elm_object_text_set(content, _("User Text")); - elm_check_state_set(content, true); - break; - case WIDGET_SLIDER: - content = elm_slider_add(object); - elm_slider_unit_format_set(content, "%1.2f units"); - elm_slider_indicator_format_set(content, "%1.2f"); - elm_slider_min_max_set(content, 0, 10); - break; - case WIDGET_ENTRY: - content = elm_entry_add(object); - elm_entry_single_line_set(content, false); - break; - case WIDGET_PROGRESSBAR: - content = elm_progressbar_add(object); - break; - } - } - - part->object = content; + part->object = object_generate(part, object); part->change = false; elm_object_part_content_set(object, part->name, content); } --