From 17a7b4db2b0e367848897187fcd5cb809bdec034 Mon Sep 17 00:00:00 2001 From: "kiso.chang" Date: Mon, 24 Oct 2016 16:47:29 +0900 Subject: [PATCH] Fix a problem to exit clock view by backspace - change clock view not to exit by backspace in keyboard when Editing datetime Change-Id: Ib5051dd52a9c3a776faa4fc3f0a3d736d0d50f41 Signed-off-by: kiso.chang --- src/view/system/view_clock.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/view/system/view_clock.c b/src/view/system/view_clock.c index eebeb57..3f31b90 100755 --- a/src/view/system/view_clock.c +++ b/src/view/system/view_clock.c @@ -83,7 +83,7 @@ static void _auto_manual_mouse_move_cb(int id, void *data, Evas *e, Evas_Object static void _auto_manual_setup_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev); /*(MOUSE) User has clicked/pressed auto/manual setup dropdown: */ -static void _auto_manual_setup_mouse_down_cb(); +static void _auto_manual_setup_clicked_cb(); /* (KEYPAD/REMOTE) User has clicked/pressed one of the options from auto/manual setup dropdown menu: */ static void _auto_manual_setup_option_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj, Evas_Event_Key_Down *ev); @@ -206,7 +206,7 @@ static void _keypad_up_cb(void *data, Evas_Object *obj, void *event_info) static input_handler _auto_manual_setup_input_handler = { .mouse_move = _auto_manual_mouse_move_cb, .key_down = _auto_manual_setup_key_down_cb, - .mouse_down = _auto_manual_setup_mouse_down_cb, + .clicked = _auto_manual_setup_clicked_cb, .focused = _focused }; @@ -335,7 +335,7 @@ static bool _add_clock_setting(clock_view_priv_data *priv) priv->done = done; /* item - SETUP (clock auto/manual) */ - priv->auto_manual_setup_btn = utils_add_button(priv->base, PART_MAIN_ITEM_SETUP, STYLE_OPTION_BTN, _(STR_MANUAL)); + priv->auto_manual_setup_btn = utils_add_button(priv->base, PART_MAIN_ITEM_SETUP, STYLE_OPTION_BTN, str_setup_type_opt[priv->cur_type]); /* TODO: For some reason, setting ampm to visible corrects the widget's layout without displaying AM/PM - remove it when datetime is fixed */ @@ -558,7 +558,7 @@ static void _auto_manual_setup_key_down_cb(int id, void *data, Evas *e, Evas_Obj } } -static void _auto_manual_setup_mouse_down_cb(int id, void *data, Evas *e, Evas_Object *obj, +static void _auto_manual_setup_clicked_cb(int id, void *data, Evas *e, Evas_Object *obj, Evas_Event_Mouse_Down *ev) { clock_view_priv_data *priv = NULL; @@ -602,9 +602,7 @@ static void _any_item_back_key_down_cb(int id, void *data, Evas *e, return; } - if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY) - || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY) - ) + if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)) viewmgr_pop_view(); } -- 2.7.4