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

whether focus highlight is enabled or not

@fix

Conflicts:

	src/lib/elm_gengrid.c
	src/lib/elm_genlist.c
	src/lib/elm_list.c

Change-Id: Ia2c61169e0fcd70aacd7bbe717a9eee8fb91bbaa

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 898ca3fed91967a295e4433d6d727b481e867da6..4a89c7aa6654abe0800adc8420815d16f23fee7c 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -3121,13 +3121,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/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 97b2e641753db8ee468afeb8c3e20cdeb0aaeea5..e363a8098709181fb3a344e05b9bc7be8c61dc0e 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -3074,8 +3074,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/src/lib/elm_list.c b/src/lib/elm_list.c
index 8371e52bf4d674465476beffa39127a48cd7fa88..39c455d81636cc9617d58e52482131f2fab5d699 100644 (file)
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -1278,8 +1278,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;