diff options
author | divyesh purohit <div.purohit@samsung.com> | 2016-01-22 11:00:20 -0800 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2016-01-22 12:10:14 -0800 |
commit | 8800fbc8394547e2a5c904b696328d493faa644a (patch) | |
tree | 49511ec40d034e869fa96b480a865486b8e627ab | |
parent | 0f6e1a46a402fd9cf848ffb1bd47c6b406eb7ffa (diff) | |
download | elementary-8800fbc8394547e2a5c904b696328d493faa644a.tar.gz |
combobox: "return" key handled correctly and removed unreachable code.
Summary:
_key_action_activate was triggered when "return" was pressed, _key_action_move
contained the "return" key handling, which is unreachable code.
@fix T3075 (1st point).
Signed-off-by: divyesh purohit <div.purohit@samsung.com>
Test Plan: please run combobox example in elementary_test
Reviewers: shilpasingh, cedric, raster
Subscribers: rajeshps, govi
Maniphest Tasks: T3075
Differential Revision: https://phab.enlightenment.org/D3599
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r-- | src/lib/elc_combobox.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/lib/elc_combobox.c b/src/lib/elc_combobox.c index cb2a835f1..3d1a80818 100644 --- a/src/lib/elc_combobox.c +++ b/src/lib/elc_combobox.c @@ -384,9 +384,7 @@ _key_action_move(Evas_Object *obj, const char *params) const char *dir = params; if (!sd->hover) return EINA_FALSE; - if (!strcmp(dir, "return")) - eo_do(obj, eo_event_callback_call(ELM_COMBOBOX_EVENT_CLICKED, NULL)); - else if (!strcmp(dir, "up")) + if (!strcmp(dir, "up")) { it = sd->item; it = elm_genlist_item_prev_get(it); @@ -409,7 +407,15 @@ _key_action_move(Evas_Object *obj, const char *params) static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) { - elm_combobox_hover_begin(obj); + ELM_COMBOBOX_DATA_GET(obj, sd); + if (!sd->expanded) + elm_combobox_hover_begin(obj); + else + { + eo_do(sd->genlist, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, + sd->item)); + elm_entry_cursor_end_set(sd->entry); + } return EINA_TRUE; } |