From b173ed7c859697e74cd5f1de852c6f47bd4a0e54 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Tue, 22 Apr 2014 23:15:20 +0900 Subject: [PATCH] genlist/gengrid/list: Fix first on_focus call correctly by checking focus highlight. First on_focus call should consider focus highlight enable status and do the different job according to that. This can be tested in "genlist 7" and "genlist focus" examples in elementary_test. --- legacy/elementary/src/lib/elm_gengrid.c | 2 +- legacy/elementary/src/lib/elm_genlist.c | 2 +- legacy/elementary/src/lib/elm_list.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c index 567d5f8cd1..8873b322e3 100644 --- a/legacy/elementary/src/lib/elm_gengrid.c +++ b/legacy/elementary/src/lib/elm_gengrid.c @@ -2222,7 +2222,7 @@ _elm_gengrid_elm_widget_on_focus(Eo *obj, Elm_Gengrid_Data *sd) it = sd->last_focused_item; else if (sd->last_selected_item) it = sd->last_selected_item; - else + else if (elm_widget_focus_highlight_enabled_get(obj)) { it = elm_gengrid_first_item_get(obj); is_sel = EINA_TRUE; diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c index 89f0517883..9f8d37f8f2 100644 --- a/legacy/elementary/src/lib/elm_genlist.c +++ b/legacy/elementary/src/lib/elm_genlist.c @@ -2844,7 +2844,7 @@ _elm_genlist_elm_widget_on_focus(Eo *obj, Elm_Genlist_Data *sd) it = sd->last_focused_item; else if (sd->last_selected_item) it = sd->last_selected_item; - else if (sd->selected) + else if (elm_widget_focus_highlight_enabled_get(obj)) { it = elm_genlist_first_item_get(obj); is_sel = EINA_TRUE; diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c index bbb97cf54d..fd5def28b8 100644 --- a/legacy/elementary/src/lib/elm_list.c +++ b/legacy/elementary/src/lib/elm_list.c @@ -1199,7 +1199,7 @@ _elm_list_elm_widget_on_focus(Eo *obj, Elm_List_Data *sd) it = sd->last_focused_item; else if (sd->last_selected_item) it = sd->last_selected_item; - else + else if (elm_widget_focus_highlight_enabled_get(obj)) { it = eina_list_data_get(sd->items); is_sel = EINA_TRUE;