gengrid/genlist/list: focus first item if first_item_focus_on_first_focus_in is on

whether focus highlight is enabled or not

@fix

diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c
index 901e9be..0f41654 100644 (file)
--- a/legacy/elementary/src/lib/elm_gengrid.c
+++ b/legacy/elementary/src/lib/elm_gengrid.c
@@ -3132,13 +3132,11 @@ _elm_gengrid_elm_widget_on_focus(Eo *obj, Elm_Gengrid_Data *sd)
           eo_it = sd->last_focused_item;
         else if (sd->last_selected_item)
           eo_it = sd->last_selected_item;
-        else if (_elm_config->first_item_focus_on_first_focus_in &&
-                 elm_widget_focus_highlight_enabled_get(obj))
+        else if (_elm_config->first_item_focus_on_first_focus_in)
           {
              eo_it = elm_gengrid_first_item_get(obj);
              is_sel = EINA_TRUE;
           }
-
         if (eo_it)
           {
              eo_it = _elm_gengrid_nearest_visible_item_get(obj, eo_it);

diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index 1a4b034..2169d61 100644 (file)
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -3087,8 +3087,7 @@ _elm_genlist_elm_widget_on_focus(Eo *obj, Elm_Genlist_Data *sd)
           eo_it = sd->last_focused_item;
         else if (sd->last_selected_item)
           eo_it = sd->last_selected_item;
-        else if (_elm_config->first_item_focus_on_first_focus_in &&
-                 elm_widget_focus_highlight_enabled_get(obj))
+        else if (_elm_config->first_item_focus_on_first_focus_in)
           {
              eo_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 71bf207..819c9ba 100644 (file)
--- a/legacy/elementary/src/lib/elm_list.c
+++ b/legacy/elementary/src/lib/elm_list.c
@@ -1276,8 +1276,7 @@ _elm_list_elm_widget_on_focus(Eo *obj, Elm_List_Data *sd)
           eo_it = sd->last_focused_item;
         else if (sd->last_selected_item)
           eo_it = sd->last_selected_item;
-        else if (_elm_config->first_item_focus_on_first_focus_in &&
-                 elm_widget_focus_highlight_enabled_get(obj))
+        else if (_elm_config->first_item_focus_on_first_focus_in)
           {
              eo_it = elm_list_first_item_get(obj);
              is_sel = EINA_TRUE;