From 1c773a8502b308db8c3e62448cde2060a8cce9ed Mon Sep 17 00:00:00 2001 From: Pawel Aksiutowicz Date: Tue, 30 May 2017 14:27:48 +0200 Subject: [PATCH] [UI] Complement remote control handling Change-Id: Ie05ebe0d581455ad79da1cf7cdf253afe1e28912 Signed-off-by: Pawel Aksiutowicz --- src/view/common/view_datetime.c | 41 +++++++++++++------------- src/view/picture/view_picture_slider_generic.c | 3 +- src/view/system/view_clock.c | 2 +- src/view/system/view_language.c | 2 +- src/view/system/view_voice_control.c | 2 +- 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/view/common/view_datetime.c b/src/view/common/view_datetime.c index 2c5f16f..e363fe5 100644 --- a/src/view/common/view_datetime.c +++ b/src/view/common/view_datetime.c @@ -162,24 +162,28 @@ static void _datetime_btn_keydown_cb(int id, void *data, Evas *e, Evas_Object * Evas_Object *spinner = view_datetime_get_spinner(dt, id); double value = elm_spinner_value_get(spinner); - switch (ev->keycode) { - case KEY_ID_BACK: - case KEY_ID_ENTER: - evas_object_hide(datetime_data->popup); - dlog_print(DLOG_DEBUG, LOG_TAG, "[%s:%d] btn PRESSED [KEY_ID_BACK]", __FILE__, __LINE__); - break; - case KEY_ID_UP: - elm_spinner_value_set(spinner, value + 1); - dlog_print(DLOG_DEBUG, LOG_TAG, "[%s:%d] btn PRESSED [KEY_ID_UP]", __FILE__, __LINE__); - break; - case KEY_ID_DOWN: - elm_spinner_value_set(spinner, value - 1); - dlog_print(DLOG_DEBUG, LOG_TAG, "[%s:%d] btn PRESSED [KEY_ID_DOWN]", __FILE__, __LINE__); - break; + 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); + 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); + dlog_print(DLOG_DEBUG, LOG_TAG, "[%s:%d] btn PRESSED [KEY_ID_DOWN]", + __FILE__, __LINE__); } if (datetime_data->hide_cb) - datetime_data->hide_cb(datetime_data->hide_cb_data, dt, (ev->keycode == KEY_ID_ENTER)); + datetime_data->hide_cb(datetime_data->hide_cb_data, dt, + (!strcmp(ev->keyname, KEY_ENTER))); } static void _set_spinner_btn_callbacks(Evas_Object *popup, Evas_Object *dt, int start_field, int end_field, view_datetime_data_t *datetime_data) @@ -211,13 +215,10 @@ static void _datetime_keydown_cb(int id, void *data, Evas *e, Evas_Object *obj, Evas_Object *neighbour = NULL; - switch (ev->keycode) { - case KEY_ID_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); - break; - default: - break; } dlog_print(DLOG_INFO, LOG_TAG, "[%s:%d] Datetime %p keydown %s neighbour: %s(%p)", __FILE__, __LINE__, diff --git a/src/view/picture/view_picture_slider_generic.c b/src/view/picture/view_picture_slider_generic.c index 44b0662..def2ff5 100644 --- a/src/view/picture/view_picture_slider_generic.c +++ b/src/view/picture/view_picture_slider_generic.c @@ -168,7 +168,8 @@ static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj, } if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY) - || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)) + || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY) + || !strcmp(ev->keyname, KEY_ENTER)) viewmgr_pop_view(); } diff --git a/src/view/system/view_clock.c b/src/view/system/view_clock.c index dceaf7a..6a11f2b 100755 --- a/src/view/system/view_clock.c +++ b/src/view/system/view_clock.c @@ -510,7 +510,7 @@ static void _any_item_back_key_down_cb(int id, void *data, Evas *e, } if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY) - || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)) + || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)) viewmgr_pop_view(); } diff --git a/src/view/system/view_language.c b/src/view/system/view_language.c index 65def18..e77eb32 100644 --- a/src/view/system/view_language.c +++ b/src/view/system/view_language.c @@ -189,7 +189,7 @@ static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj, } if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY) - || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)) + || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)) viewmgr_pop_view(); } diff --git a/src/view/system/view_voice_control.c b/src/view/system/view_voice_control.c index af44fb2..1e33980 100644 --- a/src/view/system/view_voice_control.c +++ b/src/view/system/view_voice_control.c @@ -219,7 +219,7 @@ static void _key_down_cb(int id, void *data, Evas *e, Evas_Object *obj, } if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY) - || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)) + || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)) viewmgr_pop_view(); } -- 2.7.4