From 0dc4ef5aefd7491090180944db5cafa22a139983 Mon Sep 17 00:00:00 2001 From: Kim Shinwoo Date: Mon, 15 Oct 2012 05:47:02 +0000 Subject: [PATCH] From: Kim Shinwoo Subject: [E-devel] [patch][elementary] toolbar - highlighting item on access the current toolbar does not show highlight effect on accessibility mode. the attached would give the highlight to toolbar item. please review the patch and give feedback. thanks. SVN revision: 77972 --- legacy/elementary/ChangeLog | 4 ++++ legacy/elementary/src/lib/elm_toolbar.c | 25 ++++++++++++------------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index a0fc525177..3d74bd188d 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -610,3 +610,7 @@ * Add display mode change feature related with keypad state change to elm conformant and naviframe. + +2012-10-15 Shinwoo Kim (kimcinoo) + + * Add access features to toolbar items diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c index 857bb04d6e..a36a96116d 100644 --- a/legacy/elementary/src/lib/elm_toolbar.c +++ b/legacy/elementary/src/lib/elm_toolbar.c @@ -1501,12 +1501,12 @@ _layout(Evas_Object *o, } static char * -_access_info_cb(void *data __UNUSED__, +_access_info_cb(void *data, Evas_Object *obj __UNUSED__, - Elm_Widget_Item *item) + Elm_Widget_Item *item __UNUSED__) { - Elm_Toolbar_Item *it = (Elm_Toolbar_Item *)item; - const char *txt = item->access_info; + Elm_Toolbar_Item *it = (Elm_Toolbar_Item *)data; + const char *txt = ((Elm_Widget_Item *)it)->access_info; if (!txt) txt = it->label; if (txt) return strdup(txt); @@ -1515,11 +1515,11 @@ _access_info_cb(void *data __UNUSED__, } static char * -_access_state_cb(void *data __UNUSED__, +_access_state_cb(void *data, Evas_Object *obj __UNUSED__, Elm_Widget_Item *item __UNUSED__) { - Elm_Toolbar_Item *it = (Elm_Toolbar_Item *)item; + Elm_Toolbar_Item *it = (Elm_Toolbar_Item *)data; if (it->separator) return strdup(E_("Separator")); @@ -1605,14 +1605,13 @@ _item_new(Evas_Object *obj, VIEW(it) = edje_object_add(evas_object_evas_get(obj)); - _elm_access_item_register(&it->base, VIEW(it)); - _elm_access_text_set - (_elm_access_item_get(&it->base), ELM_ACCESS_TYPE, E_("Tool Item")); + Elm_Access_Info *ai; + _elm_access_widget_item_register((Elm_Widget_Item *)it); + ai = _elm_access_object_get(it->base.access_obj); - _elm_access_callback_set - (_elm_access_item_get(&it->base), ELM_ACCESS_INFO, _access_info_cb, it); - _elm_access_callback_set - (_elm_access_item_get(&it->base), ELM_ACCESS_STATE, _access_state_cb, it); + _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Toolbar Item")); + _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it); + _elm_access_callback_set(ai, ELM_ACCESS_STATE, _access_state_cb, it); if (_item_icon_set(icon_obj, "toolbar/", icon)) {