From e38454b99c230dbaaf1a62d525c388805c8a0228 Mon Sep 17 00:00:00 2001 From: Woochan Lee Date: Tue, 30 Jan 2018 13:19:52 +0900 Subject: [PATCH] efl_ui_clock: To support clock module. efl_ui_clock_private.h, elm_datetime.h needs in module. Disable Upstream only codes. Change-Id: I93327a2ce09ec0fee7a18bd210d901c1d4106c58 --- src/Makefile_Elementary.am | 4 ++-- src/lib/elementary/efl_ui_clock.c | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index d8270a3..320a1c4 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -293,6 +293,8 @@ includesunstable_HEADERS = \ lib/elementary/elm_widget_calendar.h \ lib/elementary/efl_ui_calendar_private.h \ lib/elementary/efl_ui_check_private.h \ + lib/elementary/efl_ui_clock_private.h \ + lib/elementary/elm_datetime.h \ lib/elementary/elm_widget_clock.h \ lib/elementary/elm_widget_colorselector.h \ lib/elementary/elm_widget_conform.h \ @@ -440,7 +442,6 @@ includesub_HEADERS = \ lib/elementary/elm_conform.h \ lib/elementary/elm_conform_legacy.h \ lib/elementary/elm_cursor.h \ - lib/elementary/elm_datetime.h \ lib/elementary/elm_dayselector.h \ lib/elementary/elm_dayselector_legacy.h \ lib/elementary/elm_debug.h \ @@ -747,7 +748,6 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/efl_ui_table_private.h \ lib/elementary/efl_ui_text.c \ lib/elementary/efl_ui_clock.c \ - lib/elementary/efl_ui_clock_private.h \ lib/elementary/efl_ui_image_factory.c \ lib/elementary/efl_ui_focus_manager.c \ lib/elementary/efl_ui_focus_manager_calc.c \ diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c index 7008e5a..45d498c 100644 --- a/src/lib/elementary/efl_ui_clock.c +++ b/src/lib/elementary/efl_ui_clock.c @@ -606,7 +606,9 @@ _efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd) { field = sd->field_list + idx; // TODO: Different group name for each field_obj may be needed. - elm_widget_element_update(obj, field->item_obj, PART_NAME_ARRAY[idx]); + //TIZEN_ONLY(20180125): This is not Tizen UX. + //elm_widget_element_update(obj, field->item_obj, PART_NAME_ARRAY[idx]); + // if (field->fmt_exist && field->visible) { snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR, @@ -977,7 +979,10 @@ _efl_ui_clock_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Clock_Data *priv) ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); if (!elm_widget_theme_klass_get(obj)) - elm_widget_theme_klass_set(obj, "uiclock"); + //TIZEN_ONLY(20180125): To manintain compatibility. + //elm_widget_theme_klass_set(obj, "uiclock"); + elm_widget_theme_klass_set(obj, "datetime"); + // efl_canvas_group_add(efl_super(obj, MY_CLASS)); elm_widget_sub_object_parent_add(obj); -- 2.7.4