From 78477da92690fe1e2faa7eab7c7399abf868a856 Mon Sep 17 00:00:00 2001 From: SangHyeon Lee Date: Fri, 22 Apr 2016 16:15:15 +0900 Subject: [PATCH] genlist : arrange focus set in mouse up Summary : when mouse up happens, item must be focused, and after that, select must be called. current logic, focus is already called inside the select function and again focus set is called in the end of mouse_up, so if user new focused widget inside the select callback, mouse_up forcely take the focus into the item again. select callback should comes after the focus callback calls to work properly. Change-Id: I11401daecfa56c7036f23bc221796d81210966ee Signed-off-by: SangHyeon Lee --- src/lib/elm_genlist.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index a2a76bc..fccccb9 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -4926,6 +4926,9 @@ _item_mouse_up_cb(void *data, evas_object_ref(sd->obj); + if (sd->focused_item != EO_OBJ(it)) + elm_object_item_focus_set(EO_OBJ(it), EINA_TRUE); + if (sd->multi && ((sd->multi_select_mode != ELM_OBJECT_MULTI_SELECT_MODE_WITH_CONTROL) || (evas_key_modifier_is_set(ev->modifiers, "Control")))) @@ -4965,9 +4968,6 @@ _item_mouse_up_cb(void *data, if (_item_select(it)) goto deleted; } - if (sd->focused_item != EO_OBJ(it)) - elm_object_item_focus_set(EO_OBJ(it), EINA_TRUE); - deleted: evas_object_unref(sd->obj); } -- 2.7.4