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

gengrid: Added focus movement on widget items by mouse in. 

Summary:
- Added a test case in "Gengrid Focus".
@feature

Test Plan: elementary_test->Gengrid Focus

Reviewers: raster, cedric, woohyun

Reviewed By: raster

CC: seoz

Differential Revision: https://phab.enlightenment.org/D664
This commit is contained in:
Amitesh Singh 2014-04-01 20:26:13 +09:00 committed by Carsten Haitzler (Rasterman)
parent daee26de35
commit a090a1cc1f
2 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
legacy/elementary/src/bin/test_gengrid.c
View File

@ -1323,12 +1323,26 @@ _gengrid_focus_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
printf("\n=== Key Down : %s ===\n", ev->keyname);
}
static void
test_gengrid_focus_focus_move_policy_changed(void *data EINA_UNUSED,
Evas_Object *obj,
void *event_info EINA_UNUSED)
{
int val = elm_radio_value_get(obj);
if (val == 0)
elm_config_focus_move_policy_set(ELM_FOCUS_MOVE_POLICY_CLICK);
else if (val == 1)
elm_config_focus_move_policy_set(ELM_FOCUS_MOVE_POLICY_IN);
}
void
test_gengrid_focus(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Evas_Object *win, *bx, *bx_horiz, *gengrid, *btn, *fr, *lb;
Evas_Object *win, *bx, *bx_horiz, *gengrid, *btn, *fr, *lb, *bx_mv, *rdg,
*rd;
Elm_Gengrid_Item_Class *ic;
Item_Data *id;
char buf[PATH_MAX];
@ -1399,6 +1413,40 @@ test_gengrid_focus(void *data EINA_UNUSED,
elm_box_pack_end(bx_horiz, btn);
evas_object_show(btn);
//Focus movement policy
fr = elm_frame_add(bx);
elm_object_text_set(fr, "Focus Movement Policy");
evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(bx, fr);
evas_object_show(fr);
bx_mv = elm_box_add(fr);
elm_box_horizontal_set(bx_mv, EINA_TRUE);
elm_object_content_set(fr, bx_mv);
evas_object_show(bx_mv);
rdg = rd = elm_radio_add(bx_mv);
elm_object_text_set(rd, "Focus Move by Click");
elm_radio_state_value_set(rd, 0);
evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, 0.0);
evas_object_smart_callback_add(rd, "changed",
test_gengrid_focus_focus_move_policy_changed,
NULL);
elm_box_pack_end(bx_mv, rd);
evas_object_show(rd);
rd = elm_radio_add(bx_mv);
elm_object_text_set(rd, "Focus Move by Mouse-In");
elm_radio_group_add(rd, rdg);
elm_radio_state_value_set(rd, 1);
evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, 0.0);
evas_object_smart_callback_add(rd, "changed",
test_gengrid_focus_focus_move_policy_changed,
NULL);
elm_box_pack_end(bx_mv, rd);
evas_object_show(rd);
ic = elm_gengrid_item_class_new();
ic->item_style = "default";
ic->func.text_get = grid_text_get;

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

@ -305,6 +305,17 @@ _item_unselect(Elm_Gen_Item *it)
}
}
static void
_item_mouse_in_cb(void *data,
Evas *evas EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
if (!elm_object_item_disabled_get(data) &&
(_elm_config->focus_move_policy == ELM_FOCUS_MOVE_POLICY_IN))
elm_object_item_focus_set(data, EINA_TRUE);
}
static void
_item_mouse_move_cb(void *data,
Evas *evas EINA_UNUSED,
@ -872,6 +883,8 @@ _item_realize(Elm_Gen_Item *it)
(VIEW(it), EVAS_CALLBACK_MOUSE_UP, _item_mouse_up_cb, it);
evas_object_event_callback_add
(VIEW(it), EVAS_CALLBACK_MOUSE_MOVE, _item_mouse_move_cb, it);
evas_object_event_callback_add
(VIEW(it), EVAS_CALLBACK_MOUSE_IN, _item_mouse_in_cb, it);
_elm_gengrid_item_index_update(it);