elm access: Create access object only when access mode is enabled.

SVN revision: 78992
This commit is contained in:
Daniel Juyung Seo 2012-11-08 08:02:12 +00:00
parent a128399b3a
commit 71d832404a
3 changed files with 36 additions and 27 deletions

View File

@ -625,16 +625,19 @@ _item_new(Evas_Object *obj,
}
//XXX: ACCESS
_elm_access_widget_item_register((Elm_Widget_Item *)it);
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
{
_elm_access_widget_item_register((Elm_Widget_Item *)it);
_elm_access_text_set(_elm_access_object_get(it->base.access_obj),
ELM_ACCESS_TYPE, E_("diskselector item"));
_elm_access_callback_set(_elm_access_object_get(it->base.access_obj),
ELM_ACCESS_INFO,
_access_info_cb, it);
_elm_access_on_highlight_hook_set(
_elm_access_object_get(it->base.access_obj), _access_on_highlight_cb,
it);
_elm_access_text_set(_elm_access_object_get(it->base.access_obj),
ELM_ACCESS_TYPE, E_("diskselector item"));
_elm_access_callback_set(_elm_access_object_get(it->base.access_obj),
ELM_ACCESS_INFO,
_access_info_cb, it);
_elm_access_on_highlight_hook_set(
_elm_access_object_get(it->base.access_obj), _access_on_highlight_cb,
it);
}
return it;
}

View File

@ -1387,19 +1387,22 @@ _item_new(Evas_Object *obj,
VIEW(it) = edje_object_add(evas_object_evas_get(obj));
// ACCESS
_elm_access_widget_item_register((Elm_Widget_Item *)it);
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
{
_elm_access_widget_item_register((Elm_Widget_Item *)it);
_elm_access_text_set(_elm_access_object_get(it->base.access_obj),
ELM_ACCESS_TYPE, E_("List Item"));
_elm_access_callback_set(_elm_access_object_get(it->base.access_obj),
ELM_ACCESS_INFO,
_access_info_cb, it);
_elm_access_callback_set(_elm_access_object_get(it->base.access_obj),
ELM_ACCESS_STATE,
_access_state_cb, it);
_elm_access_on_highlight_hook_set(
_elm_access_object_get(it->base.access_obj), _access_on_highlight_cb,
it);
_elm_access_text_set(_elm_access_object_get(it->base.access_obj),
ELM_ACCESS_TYPE, E_("List Item"));
_elm_access_callback_set(_elm_access_object_get(it->base.access_obj),
ELM_ACCESS_INFO,
_access_info_cb, it);
_elm_access_callback_set(_elm_access_object_get(it->base.access_obj),
ELM_ACCESS_STATE,
_access_state_cb, it);
_elm_access_on_highlight_hook_set(
_elm_access_object_get(it->base.access_obj), _access_on_highlight_cb,
it);
}
edje_object_mirrored_set(VIEW(it), elm_widget_mirrored_get(obj));
evas_object_event_callback_add

View File

@ -1656,13 +1656,16 @@ _item_new(Evas_Object *obj,
VIEW(it) = edje_object_add(evas_object_evas_get(obj));
Elm_Access_Info *ai;
_elm_access_widget_item_register((Elm_Widget_Item *)it);
ai = _elm_access_object_get(it->base.access_obj);
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
{
Elm_Access_Info *ai;
_elm_access_widget_item_register((Elm_Widget_Item *)it);
ai = _elm_access_object_get(it->base.access_obj);
_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);
_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))
{