Clock->datetime fix 17/151017/2
authorRadek Kintop <r.kintop@samsung.com>
Tue, 19 Sep 2017 10:43:59 +0000 (12:43 +0200)
committerRadek Kintop <r.kintop@samsung.com>
Tue, 19 Sep 2017 10:55:57 +0000 (12:55 +0200)
- Date spinner value was chnged twice on arrow click

Change-Id: I92e95ca3cb5331a4ba91daed6221fec97bfa26dd
Signed-off-by: Radek Kintop <r.kintop@samsung.com>
src/view/common/view_datetime.c

index e363fe5ddd060a3cfa5dddf1117b2143effda235..733ba562a66243a9d66f01ee04d5a7f4c4663293 100644 (file)
@@ -69,6 +69,11 @@ Evas_Object *view_datetime_create(Evas_Object *parent, const char *part, bool is
                return NULL;
        }
 
+       if (!datetime_data) {
+               dlog_print(DLOG_ERROR, LOG_TAG, "[%s:%d] !datetime_data", __FILE__, __LINE__);
+               return NULL;
+       }
+
        evas_object_repeat_events_set(datetime, EINA_FALSE);
        elm_object_focus_allow_set(datetime, EINA_TRUE);
 
@@ -159,26 +164,18 @@ static void  _datetime_btn_keydown_cb(int id, void *data, Evas *e, Evas_Object *
 {
        view_datetime_data_t *datetime_data = (view_datetime_data_t *)data;
        Evas_Object *dt = elm_object_content_get(datetime_data->popup);
-       Evas_Object *spinner = view_datetime_get_spinner(dt, id);
-       double value = elm_spinner_value_get(spinner);
 
-       if(!strcmp(ev->keyname, KEY_ENTER) || !strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY))
-       {
+       if (!strcmp(ev->keyname, KEY_ENTER) || !strcmp(ev->keyname, KEY_BACK) ||
+               !strcmp(ev->keyname, KEY_BACK_WAY)) {
                evas_object_hide(datetime_data->popup);
                dlog_print(DLOG_DEBUG, LOG_TAG, "[%s:%d] btn PRESSED [KEY_ID_BACK]",
-                               __FILE__, __LINE__);
-       }
-       else if(!strcmp(ev->keyname, KEY_UP))
-       {
-               elm_spinner_value_set(spinner, value + 1);
+                                                                                                               __FILE__, __LINE__);
+       } else if (!strcmp(ev->keyname, KEY_UP)) {
                dlog_print(DLOG_DEBUG, LOG_TAG, "[%s:%d] btn PRESSED [KEY_ID_UP]",
-                               __FILE__, __LINE__);
-       }
-       else if(!strcmp(ev->keyname, KEY_DOWN))
-       {
-               elm_spinner_value_set(spinner, value - 1);
+                                                                                                               __FILE__, __LINE__);
+       } else if (!strcmp(ev->keyname, KEY_DOWN)) {
                dlog_print(DLOG_DEBUG, LOG_TAG, "[%s:%d] btn PRESSED [KEY_ID_DOWN]",
-                               __FILE__, __LINE__);
+                                                                                                               __FILE__, __LINE__);
        }
 
        if (datetime_data->hide_cb)
@@ -215,8 +212,7 @@ static void _datetime_keydown_cb(int id, void *data, Evas *e, Evas_Object *obj,
 
        Evas_Object *neighbour = NULL;
 
-       if(!strcmp(ev->keyname, KEY_ENTER))
-       {
+       if (!strcmp(ev->keyname, KEY_ENTER)) {
                neighbour = elm_object_focus_next_object_get(obj, ELM_FOCUS_NEXT);
                elm_object_focus_set(neighbour, EINA_TRUE);
        }