From 94b7d53c3bfdbb83557377625bfbaafecacc475b Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Tue, 24 Apr 2018 22:18:35 +0200 Subject: [PATCH] elm_genlist: do not not right left top down in action_move the internal movement logic was resulting in wrong movements skipping children items. --- src/lib/elementary/elm_genlist.c | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index e1d9d3430d..8259c38083 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -3106,42 +3106,13 @@ _key_action_move(Evas_Object *obj, const char *params) (obj, NULL, NULL, &v_w, &v_h); _elm_widget_focus_auto_show(obj); - if (!strcmp(dir, "left")) - { - x -= step_x; - Elm_Object_Item *eo_gt = elm_genlist_selected_item_get(obj); - ELM_GENLIST_ITEM_DATA_GET(eo_gt, gt); - _elm_genlist_item_content_focus_set(gt, ELM_FOCUS_LEFT); - - return EINA_FALSE; - } - else if (!strcmp(dir, "right")) - { - x += step_x; - - Elm_Object_Item *eo_gt = elm_genlist_selected_item_get(obj); - ELM_GENLIST_ITEM_DATA_GET(eo_gt, gt); - _elm_genlist_item_content_focus_set(gt, ELM_FOCUS_RIGHT); - - return EINA_FALSE; - } - else if (!strcmp(dir, "up")) - { - if (_key_action_move_dir(obj, ELM_FOCUS_UP, EINA_FALSE)) return EINA_TRUE; - else return EINA_FALSE; - } - else if (!strcmp(dir, "up_multi")) + if (!strcmp(dir, "up_multi")) { if (_key_action_move_dir(obj, ELM_FOCUS_UP, EINA_TRUE)) return EINA_TRUE; else if (_key_action_move_dir(obj, ELM_FOCUS_UP, EINA_FALSE)) return EINA_TRUE; else return EINA_FALSE; } - else if (!strcmp(dir, "down")) - { - if (_key_action_move_dir(obj, ELM_FOCUS_DOWN, EINA_FALSE)) return EINA_TRUE; - else return EINA_FALSE; - } else if (!strcmp(dir, "down_multi")) { if (_key_action_move_dir(obj, ELM_FOCUS_DOWN, EINA_TRUE)) return EINA_TRUE;