rvandegrift
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gengrid once again selects items using keyboard when no item was previously selected 

this was yet another thing broken by the mostly-unreviewed and untested widget item focus feature. it's still not completely fixed, since the reorder modes are broken, but at least it works for the general case again

@fix
This commit is contained in:
zmike 2014-08-10 14:28:16 -04:00
parent 4052f7521e
commit fc26cb04da
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
legacy/elementary/src/lib/elm_gengrid.c
View File

@ -2587,8 +2587,8 @@ _key_action_move(Evas_Object *obj, const char *params)
}
else
{
if (_elm_gengrid_item_edge_check(sd->focused_item, ELM_FOCUS_LEFT) ||
!elm_gengrid_item_prev_get(sd->focused_item))
if (sd->focused_item && (_elm_gengrid_item_edge_check(sd->focused_item, ELM_FOCUS_LEFT) ||
!elm_gengrid_item_prev_get(sd->focused_item)))
{
if (sd->item_loop_enable)
{
@ -2654,7 +2654,7 @@ _key_action_move(Evas_Object *obj, const char *params)
}
if (sd->horizontal)
{
if (_elm_gengrid_item_edge_check(sd->focused_item, ELM_FOCUS_RIGHT))
if (sd->focused_item && _elm_gengrid_item_edge_check(sd->focused_item, ELM_FOCUS_RIGHT))
{
if (sd->item_loop_enable)
{
@ -2672,8 +2672,8 @@ _key_action_move(Evas_Object *obj, const char *params)
}
else
{
if (_elm_gengrid_item_edge_check(sd->focused_item, ELM_FOCUS_RIGHT) ||
!elm_gengrid_item_next_get(sd->focused_item))
if (sd->focused_item && (_elm_gengrid_item_edge_check(sd->focused_item, ELM_FOCUS_RIGHT) ||
!elm_gengrid_item_next_get(sd->focused_item)))
{
if (sd->item_loop_enable)
{
@ -2727,7 +2727,7 @@ _key_action_move(Evas_Object *obj, const char *params)
}
if (sd->horizontal)
{
if (_elm_gengrid_item_edge_check(sd->focused_item, ELM_FOCUS_UP))
if (sd->focused_item && _elm_gengrid_item_edge_check(sd->focused_item, ELM_FOCUS_UP))
return EINA_FALSE;
if (!_elm_config->item_select_on_focus_disable)
{
@ -2784,7 +2784,7 @@ _key_action_move(Evas_Object *obj, const char *params)
}
if (sd->horizontal)
{
if (_elm_gengrid_item_edge_check(sd->focused_item, ELM_FOCUS_DOWN))
if (sd->focused_item && _elm_gengrid_item_edge_check(sd->focused_item, ELM_FOCUS_DOWN))
return EINA_FALSE;
if (!_elm_config->item_select_on_focus_disable)
{