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 603e79b667451ac9ea7ebaf61cdcf52395b0532c..7768f18d6e5b40f6ab45a011807e6fcd7ec301c8 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -3025,13 +3025,11 @@ _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 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)
           {
              it = elm_gengrid_first_item_get(obj);
              is_sel = EINA_TRUE;
           }
-
         if (it)
           {
              it = _elm_gengrid_nearest_visible_item_get(obj, it);

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index f72aa7857477ca074c9f3767defa312a099fdf2f..efb68e07061e66d6f351c32a2124bebb666937e0 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -2998,8 +2998,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 (_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)
           {
              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 37c3b9d2b68ce302bf946ea57f5c2774f18d6256..028f127925da1b4db22c8abb29e0a23090ff823f 100644 (file)
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -1247,8 +1247,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 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)
           {
              it = elm_list_first_item_get(obj);
              is_sel = EINA_TRUE;