[UI] Fix in the datetime widget scaling.

Change-Id: I39007d980663a65d3749e3918a94b91d996cf5c6
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>

diff --git a/src/view/common/view_datetime.c b/src/view/common/view_datetime.c
index 5050300..2c5f16f 100644 (file)
--- a/src/view/common/view_datetime.c
+++ b/src/view/common/view_datetime.c
@@ -34,7 +34,6 @@ typedef struct {
 
 static void _DBG_datetime(Evas_Object *datetime);
 static void _set_spinner_btn_callbacks(Evas_Object *popup, Evas_Object *dt, int start_field, int end_field, view_datetime_data_t *datetime_data);
-static void _set_datetime_focus_chain(Evas_Object *datetime, int start_field, int end_field);
 static void  _datetime_btn_keydown_cb(int id, void *data, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev);
 static void _datetime_focused_cb(int id, void *data, Evas_Object *obj, Elm_Object_Item *item);
 static void _datetime_unfocused_cb(int id, void *data, Evas_Object *obj, Elm_Object_Item *item);
@@ -88,25 +87,12 @@ Evas_Object *view_datetime_create(Evas_Object *parent, const char *part, bool is
 
 void view_datetime_set_time_mode(Evas_Object *popup, Evas_Object *datetime, bool is_date, bool is_24)
 {
-       if (is_date) {
+       if (is_date)
                elm_object_style_set(datetime, "default");
-               elm_datetime_format_set(datetime, "%d/%b/%Y %H:%M");
-               _set_datetime_focus_chain(datetime, 0, 2);
-       } else {
-               if (is_24) {/*24h*/
-                       elm_object_style_set(datetime, "time_layout_24hr");
-                       elm_datetime_format_set(datetime, "%d/%b/%Y %H:%M");
-
-                       _set_datetime_focus_chain(datetime, 3, 4);
-               } else {
-                       elm_object_style_set(datetime, "time_layout");
-                       elm_datetime_format_set(datetime, "%d/%b/%Y %I:%M %p");
-
-                       _set_datetime_focus_chain(datetime, 3, 5);
-               }
-       }
-
-       _DBG_datetime(datetime);
+       else if (is_24)
+               elm_object_style_set(datetime, "time_layout_24hr");
+       else
+               elm_object_style_set(datetime, "time_layout");
 }
 
 static void _datetime_destroy_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
@@ -169,35 +155,6 @@ Evas_Object *view_datetime_get_spinner_button(Evas_Object *datetime, int field)
        return elm_object_part_content_get(spinner, "elm.swallow.text_button");
 }
 
-static void _set_datetime_focus_chain(Evas_Object *datetime, int start_field, int end_field)
-{
-       Evas_Object *prev = NULL;
-       Evas_Object *btn = NULL;
-
-       btn = view_datetime_get_spinner_button(datetime, start_field);
-       utils_set_obj_focus(btn, btn, NULL, btn, btn, NULL, btn, true);
-       elm_object_focus_next_object_set(datetime, btn, ELM_FOCUS_NEXT);
-
-       prev = btn;
-
-       int i;
-       for (i = start_field + 1; i < end_field; ++i) {
-
-               btn = view_datetime_get_spinner_button(datetime, i);
-               if (!btn) {
-                       dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] btn == NULL", __FILE__, __LINE__);
-                       continue;
-               }
-
-               dlog_print(DLOG_DEBUG, LOG_TAG, "[%s:%d] (%d) BUTTON: %s", __FILE__, __LINE__, i, elm_object_text_get(btn));
-               utils_set_obj_focus(btn, prev, NULL, btn, btn, NULL, prev, true);
-               prev = btn;
-       }
-
-       btn = view_datetime_get_spinner_button(datetime, end_field);
-       utils_set_obj_focus(btn, prev, btn, btn, btn, btn, prev, true);
-}
-
 static void  _datetime_btn_keydown_cb(int id, void *data, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev)
 {
        view_datetime_data_t *datetime_data = (view_datetime_data_t *)data;