enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

elm_list: check there is focused item when list get focus at first 

Summary:
list have got focus. but there isn't logic to check whether focused_item exist.
we need that logic for list focus
this fixes T6807, T6799

Test Plan: elementary_test -to 'list focus'

Reviewers: bu5hm4n

Reviewed By: bu5hm4n

Subscribers: cedric

Maniphest Tasks: T6807, T6799

Differential Revision: https://phab.enlightenment.org/D5935
This commit is contained in:
YeongJong Lee 2018-04-15 11:08:14 +02:00 committed by Marcel Hollerbach
parent f0a0da9f44
commit ffbbf7b7d6
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/lib/elementary/elm_list.c
View File

@ -376,6 +376,22 @@ _elm_list_efl_ui_widget_event_direction(Evas_Object *obj, Elm_Focus_Direction di
(!sd->h_mode && (dir != ELM_FOCUS_UP) && (dir != ELM_FOCUS_DOWN)))
return EINA_FALSE;
// check if list get focus at first
focus_only = _elm_config->item_select_on_focus_disable;
if (!sd->focused_item)
{
if ((dir == ELM_FOCUS_LEFT) || (dir == ELM_FOCUS_UP))
eo_it = elm_list_last_item_get(obj);
else
eo_it = elm_list_first_item_get(obj);
if (focus_only)
elm_object_item_focus_set(eo_it, EINA_TRUE);
else
elm_list_item_selected_set(eo_it, EINA_TRUE);
return EINA_TRUE;
}
// get content size and viewport size
if ((dir == ELM_FOCUS_LEFT) || (dir == ELM_FOCUS_RIGHT))
{
@ -391,7 +407,6 @@ _elm_list_efl_ui_widget_event_direction(Evas_Object *obj, Elm_Focus_Direction di
}
// move focus or selection according to the configuration
focus_only = _elm_config->item_select_on_focus_disable;
if (focus_only)
ret = _item_focused_next(obj, dir);
else
@ -3073,7 +3088,7 @@ _elm_list_item_coordinates_adjust(Elm_List_Item_Data *it)
}
EOLIAN static Eina_Rect
_elm_list_efl_ui_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, Elm_List_Data *sd)
_elm_list_efl_ui_widget_focus_highlight_geometry_get(Eo *obj, Elm_List_Data *sd)
{
Eina_Rect r = {};
@ -3083,6 +3098,10 @@ _elm_list_efl_ui_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, Elm_Li
r = _elm_list_item_coordinates_adjust(focus_it);
elm_widget_focus_highlight_focus_part_geometry_get(VIEW(focus_it), &r.x, &r.y, &r.w, &r.h);
}
else
{
r = efl_gfx_geometry_get(obj);
}
return r;
}