forked from enlightenment/efl
From: Kim Shinwoo <kimcinoo.efl@gmail.com>
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
This commit is contained in:
parent
2640f9a966
commit
0dc4ef5aef
|
@ -610,3 +610,7 @@
|
||||||
|
|
||||||
* Add display mode change feature related with keypad state change
|
* Add display mode change feature related with keypad state change
|
||||||
to elm conformant and naviframe.
|
to elm conformant and naviframe.
|
||||||
|
|
||||||
|
2012-10-15 Shinwoo Kim (kimcinoo)
|
||||||
|
|
||||||
|
* Add access features to toolbar items
|
||||||
|
|
|
@ -1501,12 +1501,12 @@ _layout(Evas_Object *o,
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *
|
static char *
|
||||||
_access_info_cb(void *data __UNUSED__,
|
_access_info_cb(void *data,
|
||||||
Evas_Object *obj __UNUSED__,
|
Evas_Object *obj __UNUSED__,
|
||||||
Elm_Widget_Item *item)
|
Elm_Widget_Item *item __UNUSED__)
|
||||||
{
|
{
|
||||||
Elm_Toolbar_Item *it = (Elm_Toolbar_Item *)item;
|
Elm_Toolbar_Item *it = (Elm_Toolbar_Item *)data;
|
||||||
const char *txt = item->access_info;
|
const char *txt = ((Elm_Widget_Item *)it)->access_info;
|
||||||
|
|
||||||
if (!txt) txt = it->label;
|
if (!txt) txt = it->label;
|
||||||
if (txt) return strdup(txt);
|
if (txt) return strdup(txt);
|
||||||
|
@ -1515,11 +1515,11 @@ _access_info_cb(void *data __UNUSED__,
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *
|
static char *
|
||||||
_access_state_cb(void *data __UNUSED__,
|
_access_state_cb(void *data,
|
||||||
Evas_Object *obj __UNUSED__,
|
Evas_Object *obj __UNUSED__,
|
||||||
Elm_Widget_Item *item __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)
|
if (it->separator)
|
||||||
return strdup(E_("Separator"));
|
return strdup(E_("Separator"));
|
||||||
|
@ -1605,14 +1605,13 @@ _item_new(Evas_Object *obj,
|
||||||
|
|
||||||
VIEW(it) = edje_object_add(evas_object_evas_get(obj));
|
VIEW(it) = edje_object_add(evas_object_evas_get(obj));
|
||||||
|
|
||||||
_elm_access_item_register(&it->base, VIEW(it));
|
Elm_Access_Info *ai;
|
||||||
_elm_access_text_set
|
_elm_access_widget_item_register((Elm_Widget_Item *)it);
|
||||||
(_elm_access_item_get(&it->base), ELM_ACCESS_TYPE, E_("Tool Item"));
|
ai = _elm_access_object_get(it->base.access_obj);
|
||||||
|
|
||||||
_elm_access_callback_set
|
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Toolbar Item"));
|
||||||
(_elm_access_item_get(&it->base), ELM_ACCESS_INFO, _access_info_cb, it);
|
_elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
|
||||||
_elm_access_callback_set
|
_elm_access_callback_set(ai, ELM_ACCESS_STATE, _access_state_cb, it);
|
||||||
(_elm_access_item_get(&it->base), ELM_ACCESS_STATE, _access_state_cb, it);
|
|
||||||
|
|
||||||
if (_item_icon_set(icon_obj, "toolbar/", icon))
|
if (_item_icon_set(icon_obj, "toolbar/", icon))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue