diff options
author | Lukasz Stanislawski <lukasz.stanislawski@gmail.com> | 2018-10-14 23:11:58 +0200 |
---|---|---|
committer | Lukasz Stanislawski <lukasz.stanislawski@gmail.com> | 2018-10-14 23:11:58 +0200 |
commit | 43f5d109ca917239cc60d593e798c7f1af7a5372 (patch) | |
tree | 2bab94514a2ebcb77fb0078d22ebddc6bc5bfc0e | |
parent | d3122474d44108397b07b28447dc790dd69ab5a8 (diff) | |
download | efl-43f5d109ca917239cc60d593e798c7f1af7a5372.tar.gz |
access: remove type get/set api.
-rw-r--r-- | src/lib/elementary/efl_access_object.c | 50 | ||||
-rw-r--r-- | src/lib/elementary/efl_access_object.eo | 18 | ||||
-rw-r--r-- | src/lib/elementary/efl_ui_bg_widget.c | 2 | ||||
-rw-r--r-- | src/lib/elementary/efl_ui_box.c | 1 | ||||
-rw-r--r-- | src/lib/elementary/efl_ui_view_list.c | 1 | ||||
-rw-r--r-- | src/lib/elementary/efl_ui_widget.c | 16 | ||||
-rw-r--r-- | src/lib/elementary/efl_ui_win.c | 1 | ||||
-rw-r--r-- | src/lib/elementary/elc_multibuttonentry.c | 2 | ||||
-rw-r--r-- | src/lib/elementary/elm_atspi_app_object.c | 5 | ||||
-rw-r--r-- | src/lib/elementary/elm_box.c | 1 | ||||
-rw-r--r-- | src/lib/elementary/elm_list.c | 3 | ||||
-rw-r--r-- | src/lib/elementary/elm_menu.c | 8 | ||||
-rw-r--r-- | src/lib/elementary/elm_toolbar.c | 2 |
13 files changed, 3 insertions, 107 deletions
diff --git a/src/lib/elementary/efl_access_object.c b/src/lib/elementary/efl_access_object.c index b9626274e2..3fd3df4977 100644 --- a/src/lib/elementary/efl_access_object.c +++ b/src/lib/elementary/efl_access_object.c @@ -130,7 +130,6 @@ struct _Efl_Access_Object_Data const char *translation_domain; Efl_Access_Role role; Efl_Access_Reading_Info_Type reading_info; - Efl_Access_Type type: 2; }; typedef struct _Efl_Access_Object_Data Efl_Access_Object_Data; @@ -173,12 +172,7 @@ _efl_access_object_efl_object_provider_find(const Eo *obj, Efl_Access_Object_Dat { if (efl_isa(obj, klass)) { - if (klass == EFL_ACCESS_OBJECT_MIXIN) - { - Efl_Access_Type type = efl_access_object_access_type_get(obj); - if (type != EFL_ACCESS_TYPE_SKIPPED) return (Eo*)obj; - } - else return (Eo*)obj; + return (Eo*)obj; } return efl_provider_find(efl_super(obj, EFL_ACCESS_OBJECT_MIXIN), klass); } @@ -399,7 +393,6 @@ _efl_access_object_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *a { Eina_List *l; Efl_Access_Event_Handler *hdl; - Efl_Access_Type type; if (!accessible || !event || !efl_isa(accessible, EFL_ACCESS_OBJECT_MIXIN)) { @@ -407,18 +400,6 @@ _efl_access_object_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *a return; } - type = efl_access_object_access_type_get(accessible); - if (type != EFL_ACCESS_TYPE_REGULAR) - return; - - if (event == EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED) - { - Efl_Access_Event_Children_Changed_Data *event_data = event_info; - type = efl_access_object_access_type_get(event_data->child); - if (type != EFL_ACCESS_TYPE_REGULAR) - return; - } - Efl_Event ev; ev.object = accessible; ev.desc = event; @@ -597,35 +578,6 @@ _efl_access_object_access_root_get(const Eo *class EINA_UNUSED, void *pd EINA_UN return root; } -EOLIAN Efl_Access_Type -_efl_access_object_access_type_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd) -{ - return pd->type; -} - -EOLIAN void -_efl_access_object_access_type_set(Eo *obj, Efl_Access_Object_Data *pd, Efl_Access_Type val) -{ - Efl_Access_Object *parent; - if (val == pd->type) - return; - - parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); - - switch (val) - { - case EFL_ACCESS_TYPE_DISABLED: - case EFL_ACCESS_TYPE_SKIPPED: - if (parent) efl_access_children_changed_del_signal_emit(parent, obj); - efl_access_removed(obj); - break; - case EFL_ACCESS_TYPE_REGULAR: - if (parent) efl_access_children_changed_added_signal_emit(parent, obj); - efl_access_added(obj); - } - pd->type = val; -} - EOLIAN void _efl_access_object_efl_object_invalidate(Eo *obj, Efl_Access_Object_Data *pd) { diff --git a/src/lib/elementary/efl_access_object.eo b/src/lib/elementary/efl_access_object.eo index 898f75fc52..89279eebff 100644 --- a/src/lib/elementary/efl_access_object.eo +++ b/src/lib/elementary/efl_access_object.eo @@ -1,11 +1,3 @@ -enum Efl.Access.Type -{ - [[Type of accessibility object]] - regular, [[default accessible object]] - disabled, [[skip object and its children in accessibility hierarchy]] - skipped [[skip object in accessibility hierarchy]] -} - enum Efl.Access.Role { [[Describes the role of an object visible to Accessibility Clients.]] @@ -396,16 +388,6 @@ mixin Efl.Access.Object (Efl.Interface, Efl.Object) domain: string; [[Translation domain]] } } - @property access_type @beta { - [[Type of accessibility object]] - get { - } - set { - } - values { - type: Efl.Access.Type; [[Object type]] - } - } relationship_append @beta { [[Defines the relationship between two accessible objects. diff --git a/src/lib/elementary/efl_ui_bg_widget.c b/src/lib/elementary/efl_ui_bg_widget.c index cd05d060a7..51f4cb5458 100644 --- a/src/lib/elementary/efl_ui_bg_widget.c +++ b/src/lib/elementary/efl_ui_bg_widget.c @@ -61,8 +61,6 @@ _efl_ui_bg_widget_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Widget_Data *pd) pd->file = NULL; pd->key = NULL; - efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED); - efl_ui_widget_focus_allow_set(obj, EINA_FALSE); return obj; diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c index a00e643e0e..864e729f6f 100644 --- a/src/lib/elementary/efl_ui_box.c +++ b/src/lib/elementary/efl_ui_box.c @@ -162,7 +162,6 @@ _efl_ui_box_efl_object_constructor(Eo *obj, Efl_Ui_Box_Data *pd) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED); efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER); pd->align.h = 0.5; diff --git a/src/lib/elementary/efl_ui_view_list.c b/src/lib/elementary/efl_ui_view_list.c index 08c8604e82..09562be64c 100644 --- a/src/lib/elementary/efl_ui_view_list.c +++ b/src/lib/elementary/efl_ui_view_list.c @@ -624,7 +624,6 @@ _efl_ui_view_list_efl_canvas_group_group_add(Eo *obj, Efl_Ui_View_List_Data *pd) efl_gfx_stack_raise((Eo *)o); efl_gfx_entity_visible_set(pd->pan_obj, EINA_TRUE); - efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED); edje_object_size_min_calc(wd->resize_obj, &min.w, &min.h); efl_gfx_size_hint_restricted_min_set(obj, min); diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index b4e59134ad..23286d5e19 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -5499,21 +5499,11 @@ _efl_ui_widget_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED, { Eina_List *l, *accs = NULL; Evas_Object *widget; - Efl_Access_Type type; EINA_LIST_FOREACH(pd->subobjs, l, widget) { if (!elm_object_widget_check(widget)) continue; if (!efl_isa(widget, EFL_ACCESS_OBJECT_MIXIN)) continue; - type = efl_access_object_access_type_get(widget); - if (type == EFL_ACCESS_TYPE_DISABLED) continue; - if (type == EFL_ACCESS_TYPE_SKIPPED) - { - Eina_List *children; - children = efl_access_object_access_children_get(widget); - accs = eina_list_merge(accs, children); - continue; - } accs = eina_list_append(accs, widget); } return accs; @@ -5653,11 +5643,7 @@ _efl_ui_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd return _efl_config_obj; if (klass == EFL_ACCESS_OBJECT_MIXIN) - { - Efl_Access_Type type = efl_access_object_access_type_get(obj); - if (type != EFL_ACCESS_TYPE_SKIPPED) - return (Eo*)obj; - } + return (Eo*)obj; if (pd->provider_lookup) return NULL; pd->provider_lookup = EINA_TRUE; diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 20a70cd00a..711240734d 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -4493,7 +4493,6 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style) efreet_desktop_free(d); } } - efl_access_object_access_type_set(sd->icon, EFL_ACCESS_TYPE_DISABLED); } if (elm_widget_is_legacy(sd->obj)) diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c index 193b3204f2..6a49a80af5 100644 --- a/src/lib/elementary/elc_multibuttonentry.c +++ b/src/lib/elementary/elc_multibuttonentry.c @@ -759,8 +759,6 @@ _item_new(Elm_Multibuttonentry_Data *sd, ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_item, item); VIEW_SET(item, elm_layout_add(obj)); - efl_access_object_access_type_set(VIEW(item), EFL_ACCESS_TYPE_DISABLED); - if (!elm_layout_theme_set(VIEW(item), "multibuttonentry", PART_NAME_BUTTON, elm_widget_style_get(obj))) CRI("Failed to set layout!"); diff --git a/src/lib/elementary/elm_atspi_app_object.c b/src/lib/elementary/elm_atspi_app_object.c index 77cfe7f93c..880b39b1ca 100644 --- a/src/lib/elementary/elm_atspi_app_object.c +++ b/src/lib/elementary/elm_atspi_app_object.c @@ -33,12 +33,9 @@ _elm_atspi_app_object_efl_access_object_access_children_get(const Eo *obj EINA_U EINA_LIST_FOREACH(_elm_win_list, l, win) { - Efl_Access_Type type; if (!efl_isa(win, EFL_ACCESS_OBJECT_MIXIN)) continue; - type = efl_access_object_access_type_get(win); - if (type == EFL_ACCESS_TYPE_REGULAR) - accs = eina_list_append(accs, win); + accs = eina_list_append(accs, win); } return accs; diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index aa5366e56a..9fad6a2b10 100644 --- a/src/lib/elementary/elm_box.c +++ b/src/lib/elementary/elm_box.c @@ -376,7 +376,6 @@ _elm_box_efl_object_constructor(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED); efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER); return obj; diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index d72909c7dd..38232cb400 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -2314,7 +2314,6 @@ _item_new(Evas_Object *obj, evas_object_event_callback_add (it->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb, obj); - efl_access_object_access_type_set(it->icon, EFL_ACCESS_TYPE_DISABLED); elm_widget_tree_unfocusable_set(it->icon, EINA_TRUE); } if (it->end) @@ -2323,7 +2322,6 @@ _item_new(Evas_Object *obj, evas_object_event_callback_add (it->end, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb, obj); - efl_access_object_access_type_set(it->end, EFL_ACCESS_TYPE_DISABLED); elm_widget_tree_unfocusable_set(it->end, EINA_TRUE); } @@ -2393,7 +2391,6 @@ _elm_list_efl_canvas_group_group_add(Eo *obj, Elm_List_Data *priv) priv->box = elm_box_add(obj); evas_object_size_hint_weight_set(priv->box, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(priv->box, EVAS_HINT_FILL, 0.0); - efl_access_object_access_type_set(priv->box, EFL_ACCESS_TYPE_DISABLED); /* FIXME: change this ugly code path later */ elm_widget_on_show_region_hook_set(priv->box, obj, _show_region_hook, NULL); diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index 60069c8ba3..3040c083bb 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -581,7 +581,6 @@ static void _item_obj_create(Elm_Menu_Item_Data *item) { VIEW_SET(item, elm_layout_add(WIDGET(item))); - efl_access_object_access_type_set(VIEW(item), EFL_ACCESS_TYPE_SKIPPED); evas_object_size_hint_weight_set (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -605,7 +604,6 @@ static void _item_separator_obj_create(Elm_Menu_Item_Data *item) { VIEW_SET(item, elm_layout_add(WIDGET(item))); - efl_access_object_access_type_set(VIEW(item), EFL_ACCESS_TYPE_SKIPPED); evas_object_size_hint_weight_set (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -628,9 +626,7 @@ _item_submenu_obj_create(Elm_Menu_Item_Data *item) char style[1024]; item->submenu.location = elm_icon_add(sd->bx); - efl_access_object_access_type_set(item->submenu.location, EFL_ACCESS_TYPE_DISABLED); item->submenu.hv = hv = elm_hover_add(sd->bx); - efl_access_object_access_type_set(item->submenu.hv, EFL_ACCESS_TYPE_SKIPPED); efl_ui_mirrored_set(hv, EINA_FALSE); elm_hover_target_set(hv, item->submenu.location); elm_hover_parent_set(hv, sd->parent); @@ -696,10 +692,8 @@ _elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv) elm_widget_can_focus_set(obj, EINA_FALSE); priv->location = elm_icon_add(obj); - efl_access_object_access_type_set(priv->location, EFL_ACCESS_TYPE_DISABLED); priv->hv = elm_hover_add(obj); - efl_access_object_access_type_set(priv->hv, EFL_ACCESS_TYPE_SKIPPED); efl_ui_mirrored_set(priv->hv, EINA_FALSE); elm_object_style_set(priv->hv, "menu/default"); @@ -707,7 +701,6 @@ _elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv) (priv->hv, ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, obj); priv->bx = elm_box_add(obj); - efl_access_object_access_type_set(priv->bx, EFL_ACCESS_TYPE_SKIPPED); efl_ui_mirrored_set(priv->bx, EINA_FALSE); evas_object_size_hint_weight_set (priv->bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -1053,7 +1046,6 @@ _elm_menu_item_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *parent, const ch Evas_Object *icon_obj; icon_obj = elm_icon_add(obj); - efl_access_object_access_type_set(icon_obj, EFL_ACCESS_TYPE_DISABLED); if (!icon_obj) return NULL; eo_item = efl_add(ELM_MENU_ITEM_CLASS, obj); diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index a543f7dbc1..fd037760f3 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -2405,7 +2405,6 @@ _item_new(Evas_Object *obj, VIEW_SET(it, elm_layout_add(obj)); elm_widget_tree_unfocusable_set(VIEW(it), EINA_TRUE); evas_object_data_set(VIEW(it), "item", it); - efl_access_object_access_type_set(VIEW(it), EFL_ACCESS_TYPE_DISABLED); icon_obj = elm_icon_add(VIEW(it)); efl_parent_set(icon_obj, eo_it); @@ -2793,7 +2792,6 @@ _elm_toolbar_efl_canvas_group_group_add(Eo *obj, Elm_Toolbar_Data *priv) else elm_object_signal_emit(priv->more, "elm,orient,horizontal", "elm"); - efl_access_object_access_type_set(priv->more, EFL_ACCESS_TYPE_DISABLED); elm_widget_sub_object_add(obj, priv->more); evas_object_show(priv->more); |