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

genlist: Implemented item_select_on_focus feature. 

Summary: @feature

Test Plan: elementary_test->Genlist Focus

Reviewers: seoz, raster

CC: seoz

Differential Revision: https://phab.enlightenment.org/D705
This commit is contained in:
Amitesh Singh 2014-04-27 12:38:27 +09:00 committed by Daniel Juyung Seo
parent 9652839c96
commit 8405b15b2b
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
legacy/elementary/src/bin/test_genlist.c
View File

@ -3752,6 +3752,13 @@ _test_genlist_focus_win_del_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
timer = NULL;
}
static void
test_genlist_focus_item_select_on_focus_disable_changed(void *data EINA_UNUSED, Evas_Object *obj,
void *event_info EINA_UNUSED)
{
elm_config_item_select_on_focus_disabled_set(elm_check_state_get(obj));
}
static Eina_Bool
_focus_timer_cb(void *data)
{
@ -3980,6 +3987,16 @@ test_genlist_focus(void *data EINA_UNUSED,
elm_box_pack_end(bx_opt, chk);
evas_object_show(chk);
chk = elm_check_add(bx_opt);
elm_object_text_set(chk, "Item Select on Focus disable");
elm_check_state_set(chk, elm_config_item_select_on_focus_disabled_get());
evas_object_size_hint_weight_set(chk, EVAS_HINT_EXPAND, 0.0);
evas_object_smart_callback_add(chk, "changed",
test_genlist_focus_item_select_on_focus_disable_changed,
NULL);
elm_box_pack_end(bx_opt, chk);
evas_object_show(chk);
// Focus Movement Policy
fr = elm_frame_add(bx);
elm_object_text_set(fr, "Focus Movement Policy");

31
legacy/elementary/src/lib/elm_genlist.c
View File

@ -2479,8 +2479,6 @@ _elm_genlist_item_unfocused(Elm_Gen_Item *it)
evas_object_smart_callback_call(obj, SIG_ITEM_UNFOCUSED, it);
}
/* NOTE: this code will be used later when the item selection on key press
becomes optional. So do not remove this.
static Eina_Bool
_item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir)
{
@ -2533,7 +2531,6 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir)
return EINA_TRUE;
}
*/
static void
_elm_genlist_item_content_focus_set(Elm_Gen_Item *it, Elm_Focus_Direction dir)
@ -2587,6 +2584,7 @@ _key_action_move_dir(Evas_Object *obj, Elm_Focus_Direction dir, Eina_Bool multi)
Eina_Bool ret = EINA_FALSE;
Evas_Coord v = 0;
Evas_Coord min = 0;
Eina_Bool focus_only = EINA_FALSE;
// get content size and viewport size
eo_do(obj,
@ -2594,23 +2592,28 @@ _key_action_move_dir(Evas_Object *obj, Elm_Focus_Direction dir, Eina_Bool multi)
(NULL, NULL, NULL, &v),
elm_interface_scrollable_content_size_get(NULL, &min));
if (multi)
if (multi && !_elm_config->item_select_on_focus_disable)
{
if (dir == ELM_FOCUS_UP)
ret = _item_multi_select_up(sd);
else if (dir == ELM_FOCUS_DOWN)
ret = _item_multi_select_down(sd);
}
else
else if (!multi && !_elm_config->item_select_on_focus_disable)
{
if (dir == ELM_FOCUS_UP)
ret = _item_single_select_up(sd);
else if (dir == ELM_FOCUS_DOWN)
ret = _item_single_select_down(sd);
}
else if (_elm_config->item_select_on_focus_disable)
{
ret = _item_focused_next(obj, dir);
}
if (ret)
return EINA_TRUE;
focus_only = _elm_config->item_select_on_focus_disable && elm_widget_focus_highlight_enabled_get(obj);
// handle item loop feature
if (sd->item_loop_enable)
{
@ -2628,7 +2631,9 @@ _key_action_move_dir(Evas_Object *obj, Elm_Focus_Direction dir, Eina_Bool multi)
else if(dir == ELM_FOCUS_DOWN)
it = elm_genlist_first_item_get(obj);
if (it)
if (it && focus_only)
elm_object_item_focus_set(it, EINA_TRUE);
else if (it)
elm_genlist_item_selected_set(it, EINA_TRUE);
}
return EINA_TRUE;
@ -2751,7 +2756,7 @@ _key_action_select(Evas_Object *obj, const char *params EINA_UNUSED)
{
Elm_Object_Item *it = NULL;
it = elm_genlist_selected_item_get(obj);
it = elm_object_focused_item_get(obj);
elm_genlist_item_expanded_set(it, !elm_genlist_item_expanded_get(it));
evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, it);
@ -2916,7 +2921,7 @@ _elm_genlist_elm_widget_on_focus(Eo *obj, Elm_Genlist_Data *sd)
it = _elm_genlist_nearest_visible_item_get(obj, it);
if (it)
{
if (is_sel)
if (!_elm_config->item_select_on_focus_disable && is_sel)
elm_genlist_item_selected_set(it, EINA_TRUE);
else
elm_object_item_focus_set(it, EINA_TRUE);
@ -5161,7 +5166,10 @@ _elm_genlist_looping_up_cb(void *data,
{
Evas_Object *genlist = data;
Elm_Object_Item *it = elm_genlist_last_item_get(genlist);
elm_genlist_item_selected_set(it, EINA_TRUE);
if (!_elm_config->item_select_on_focus_disable)
elm_genlist_item_selected_set(it, EINA_TRUE);
else
elm_object_item_focus_set(it, EINA_TRUE);
elm_layout_signal_emit(genlist, "elm,action,looping,up,end", "elm");
}
@ -5173,7 +5181,10 @@ _elm_genlist_looping_down_cb(void *data,
{
Evas_Object *genlist = data;
Elm_Object_Item *it = elm_genlist_first_item_get(genlist);
elm_genlist_item_selected_set(it, EINA_TRUE);
if (!_elm_config->item_select_on_focus_disable)
elm_genlist_item_selected_set(it, EINA_TRUE);
else
elm_object_item_focus_set(it, EINA_TRUE);
elm_layout_signal_emit(genlist, "elm,action,looping,down,end", "elm");
}