From: Shinwoo Kim Date: Tue, 29 Mar 2016 11:50:32 +0000 (+0900) Subject: [atspi] Add TIZEN_ONLY comments X-Git-Tag: accepted/tizen/common/20160330.120131~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F29%2F64029%2F1;p=platform%2Fupstream%2Felementary.git [atspi] Add TIZEN_ONLY comments Change-Id: I8cc0d2a903a20ecf086c55cb5ca2d34ec2015a27 --- diff --git a/src/imported/atspi/atspi-constants.h b/src/imported/atspi/atspi-constants.h index dd10679..1eb71fc 100644 --- a/src/imported/atspi/atspi-constants.h +++ b/src/imported/atspi/atspi-constants.h @@ -629,9 +629,11 @@ typedef enum { ATSPI_STATE_VISITED, ATSPI_STATE_CHECKABLE, ATSPI_STATE_HAS_POPUP, + //TIZEN_ONLY(20160329): atspi: implement HighlightGrab and HighlightClear methods (29e253e2f7ef3c632ac3a64c489bf569df407f30) ATSPI_STATE_READ_ONLY, ATSPI_STATE_HIGHLIGHTED, ATSPI_STATE_HIGHLIGHTABLE, + // ATSPI_STATE_LAST_DEFINED, } AtspiStateType; @@ -1313,11 +1315,13 @@ typedef enum { ATSPI_ROLE_MATH, ATSPI_ROLE_RATING, ATSPI_ROLE_TIMER, + //TIZEN_ONLY(20160329): atspi: implement HighlightGrab and HighlightClear methods (29e253e2f7ef3c632ac3a64c489bf569df407f30) ATSPI_ROLE_STATIC, ATSPI_ROLE_MATH_FRACTION, ATSPI_ROLE_MATH_ROOT, ATSPI_ROLE_SUBSCRIPT, ATSPI_ROLE_SUPERSCRIPT, + // ATSPI_ROLE_LAST_DEFINED, } AtspiRole; diff --git a/src/lib/elm_atspi_bridge.c b/src/lib/elm_atspi_bridge.c index 1f6857e..581455e 100644 --- a/src/lib/elm_atspi_bridge.c +++ b/src/lib/elm_atspi_bridge.c @@ -437,11 +437,13 @@ const struct atspi_state_desc elm_states_to_atspi_state[] = { { ELM_ATSPI_STATE_SELECTABLE_TEXT, ATSPI_STATE_SELECTABLE_TEXT, "selectable-text" }, { ELM_ATSPI_STATE_IS_DEFAULT, ATSPI_STATE_IS_DEFAULT, "is-default" }, { ELM_ATSPI_STATE_VISITED, ATSPI_STATE_VISITED, "visited" }, + //TIZEN_ONLY(20160329): atspi: implement HighlightGrab and HighlightClear methods (29e253e2f7ef3c632ac3a64c489bf569df407f30) { ELM_ATSPI_STATE_CHECKABLE, ATSPI_STATE_CHECKABLE, "checkable" }, { ELM_ATSPI_STATE_HAS_POPUP, ATSPI_STATE_HAS_POPUP, "has-popup" }, { ELM_ATSPI_STATE_READ_ONLY, ATSPI_STATE_READ_ONLY, "read-only" }, { ELM_ATSPI_STATE_HIGHLIGHTED, ATSPI_STATE_HIGHLIGHTED, "highlighted" }, { ELM_ATSPI_STATE_HIGHLIGHTABLE, ATSPI_STATE_HIGHLIGHTABLE, "highlightable" }, + // { ELM_ATSPI_STATE_LAST_DEFINED, ATSPI_STATE_LAST_DEFINED, "last-defined" } }; @@ -3478,6 +3480,7 @@ _component_grab_focus(const Eldbus_Service_Interface *iface EINA_UNUSED, const E return ret; } +//TIZEN_ONLY(20160329): atspi: implement HighlightGrab and HighlightClear methods (29e253e2f7ef3c632ac3a64c489bf569df407f30) static Eldbus_Message * _component_grab_highlight(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) { @@ -3519,6 +3522,7 @@ _component_clear_highlight(const Eldbus_Service_Interface *iface EINA_UNUSED, co return ret; } +// static Eldbus_Message * _component_get_alpha(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *msg) @@ -3634,8 +3638,11 @@ static const Eldbus_Method component_methods[] = { { "SetExtents", ELDBUS_ARGS({"i", "x"}, {"i", "y"}, {"i", "width"}, {"i", "height"}, {"u", "coord_type"}), ELDBUS_ARGS({"b", "result"}), _component_set_extends, 0 }, { "SetPosition", ELDBUS_ARGS({"i", "x"}, {"i", "y"}, {"u", "coord_type"}), ELDBUS_ARGS({"b", "result"}), _component_set_position, 0 }, { "SetSize", ELDBUS_ARGS({"i", "width"}, {"i", "height"}), ELDBUS_ARGS({"b", "result"}), _component_set_size, 0 }, + + //TIZEN_ONLY(20160329): atspi: implement HighlightGrab and HighlightClear methods (29e253e2f7ef3c632ac3a64c489bf569df407f30) { "GrabHighlight", NULL, ELDBUS_ARGS({"b", "result"}), _component_grab_highlight, 0 }, { "ClearHighlight", NULL, ELDBUS_ARGS({"b", "result"}), _component_clear_highlight, 0 }, + // { NULL, NULL, NULL, NULL, 0 } }; diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index a4e6c41..2fd82a8 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -5,7 +5,9 @@ #include #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +//TIZEN_ONLY(20160329): genlist: enhance accessibility scroll & highlight (30d9a6012e629cd9ea60eae8d576f3ebb94ada86) #define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED +// #define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -1976,11 +1978,13 @@ _item_realize(Elm_Gen_Item *it, if (it->decorate_it_set) _decorate_item_set(it); edje_object_message_signal_process(VIEW(it)); + //TIZEN_ONLY(20160329): genlist: enhance accessibility scroll & highlight (30d9a6012e629cd9ea60eae8d576f3ebb94ada86) if (sd->atspi_item_to_highlight == it) { sd->atspi_item_to_highlight = NULL; eo_do_super(EO_OBJ(it), ELM_GENLIST_ITEM_CLASS, elm_interface_atspi_component_highlight_grab()); } + // } static Eina_Bool @@ -8373,6 +8377,7 @@ _elm_genlist_elm_interface_atspi_selection_child_deselect(Eo *obj EINA_UNUSED, E return EINA_FALSE; } +//TIZEN_ONLY(20160329): genlist: enhance accessibility scroll & highlight (30d9a6012e629cd9ea60eae8d576f3ebb94ada86) static int _is_item_in_viewport(int viewport_y, int viewport_h, int obj_y, int obj_h) { if ((obj_y + obj_h/2) < viewport_y) @@ -8534,5 +8539,6 @@ _elm_genlist_item_elm_interface_atspi_component_highlight_clear(Eo *eo_it, Elm_G eo_do_super(eo_it, ELM_GENLIST_ITEM_CLASS, ret = elm_interface_atspi_component_highlight_clear()); return ret; } +// #include "elm_genlist.eo.c" #include "elm_genlist_item.eo.c" diff --git a/src/lib/elm_genlist.eo b/src/lib/elm_genlist.eo index 37bcbde..b13f503 100644 --- a/src/lib/elm_genlist.eo +++ b/src/lib/elm_genlist.eo @@ -540,7 +540,9 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interfac Elm_Interface_Atspi_Selection.is_child_selected; Elm_Interface_Atspi_Selection.all_children_select; Elm_Interface_Atspi_Selection.clear; + //TIZEN_ONLY(20160329): genlist: enhance accessibility scroll & highlight (30d9a6012e629cd9ea60eae8d576f3ebb94ada86) Elm_Interface_Scrollable.content_pos_set; + // } events { language,changed; diff --git a/src/lib/elm_genlist_item.eo b/src/lib/elm_genlist_item.eo index 1151a32..a022b38 100644 --- a/src/lib/elm_genlist_item.eo +++ b/src/lib/elm_genlist_item.eo @@ -432,7 +432,9 @@ class Elm.Genlist_Item(Elm.Widget_Item) Elm_Interface_Atspi_Accessible.name.get; Elm_Interface_Atspi_Accessible.state_set.get; Elm_Interface_Atspi_Accessible.children.get; + //TIZEN_ONLY(20160329): genlist: enhance accessibility scroll & highlight (30d9a6012e629cd9ea60eae8d576f3ebb94ada86) Elm_Interface_Atspi_Component.highlight_grab; Elm_Interface_Atspi_Component.highlight_clear; + // } } diff --git a/src/lib/elm_interface_atspi_accessible.eo b/src/lib/elm_interface_atspi_accessible.eo index af1497b..027138b 100644 --- a/src/lib/elm_interface_atspi_accessible.eo +++ b/src/lib/elm_interface_atspi_accessible.eo @@ -1,6 +1,8 @@ mixin Elm_Interface_Atspi_Accessible () { + //TIZEN_ONLY(20160329): atspi: mark atspi API as public (b9a544128dfb4d23e06995a233e166b0a166ae86) legacy_prefix: elm_atspi_accessible; + // eo_prefix: elm_interface_atspi_accessible; data: Elm_Interface_Atspi_Accessible_Data; methods { diff --git a/src/lib/elm_interface_atspi_accessible.h b/src/lib/elm_interface_atspi_accessible.h index 2a1e333..9dca66e 100644 --- a/src/lib/elm_interface_atspi_accessible.h +++ b/src/lib/elm_interface_atspi_accessible.h @@ -188,11 +188,13 @@ enum _Elm_Atspi_State_Type ELM_ATSPI_STATE_SELECTABLE_TEXT, ELM_ATSPI_STATE_IS_DEFAULT, ELM_ATSPI_STATE_VISITED, + //TIZEN_ONLY(20160329): atspi: implement HighlightGrab and HighlightClear methods (29e253e2f7ef3c632ac3a64c489bf569df407f30) ELM_ATSPI_STATE_CHECKABLE, ELM_ATSPI_STATE_HAS_POPUP, ELM_ATSPI_STATE_READ_ONLY, ELM_ATSPI_STATE_HIGHLIGHTED, ELM_ATSPI_STATE_HIGHLIGHTABLE, + // ELM_ATSPI_STATE_LAST_DEFINED, }; diff --git a/src/lib/elm_interface_atspi_component.c b/src/lib/elm_interface_atspi_component.c index 7d57bda..9a216e7 100644 --- a/src/lib/elm_interface_atspi_component.c +++ b/src/lib/elm_interface_atspi_component.c @@ -149,6 +149,7 @@ _elm_interface_atspi_component_focus_grab(Eo *obj EINA_UNUSED, void *_pd EINA_UN return evas_object_focus_get(obj); } +//TIZEN_ONLY(20160329): atspi: implement HighlightGrab and HighlightClear methods (29e253e2f7ef3c632ac3a64c489bf569df407f30) EOLIAN static Eina_Bool _elm_interface_atspi_component_highlight_grab(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) { @@ -164,5 +165,6 @@ _elm_interface_atspi_component_highlight_clear(Eo *obj EINA_UNUSED, void *_pd EI eo_class_name_get(eo_class_get(obj))); return EINA_FALSE; } +// #include "elm_interface_atspi_component.eo.c" diff --git a/src/lib/elm_interface_atspi_component.eo b/src/lib/elm_interface_atspi_component.eo index 67163c7..a2754d1 100644 --- a/src/lib/elm_interface_atspi_component.eo +++ b/src/lib/elm_interface_atspi_component.eo @@ -98,6 +98,7 @@ mixin Elm_Interface_Atspi_Component () } return: Eo*; } + //TIZEN_ONLY(20160329): atspi: implement HighlightGrab and HighlightClear methods (29e253e2f7ef3c632ac3a64c489bf569df407f30) highlight_grab @protected { [[ Highlights accessible widget. returns true if highlight grab has successed, false otherwise. ]] @@ -108,5 +109,6 @@ mixin Elm_Interface_Atspi_Component () returns true if clear has successed, false otherwise. ]] return: bool; } + // } } diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c index 35ed111..1cd5d61 100644 --- a/src/lib/elm_list.c +++ b/src/lib/elm_list.c @@ -5,7 +5,9 @@ #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED +//TIZEN_ONLY(20160329): list: enhance accessibility scroll and highlight (02c20ee39a0ebbe67b9e1491ccfc46dd681821c9) #define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED +// #define ELM_WIDGET_ITEM_PROTECTED #include @@ -3303,6 +3305,7 @@ _elm_list_elm_interface_atspi_selection_child_deselect(Eo *obj EINA_UNUSED, Elm_ return EINA_FALSE; } +//TIZEN_ONLY(20160329): list: enhance accessibility scroll and highlight (02c20ee39a0ebbe67b9e1491ccfc46dd681821c9) static int _is_item_in_viewport(int viewport_y, int viewport_h, int obj_y, int obj_h) { if ((obj_y + obj_h/2) < viewport_y) @@ -3428,6 +3431,7 @@ _elm_list_item_elm_interface_atspi_component_highlight_grab(Eo *eo_it, Elm_List_ eo_do_super(eo_it, ELM_LIST_ITEM_CLASS, ret = elm_interface_atspi_component_highlight_grab()); return ret; } +// #include "elm_list.eo.c" #include "elm_list_item.eo.c" diff --git a/src/lib/elm_list.eo b/src/lib/elm_list.eo index 37adc9e..b86116b 100644 --- a/src/lib/elm_list.eo +++ b/src/lib/elm_list.eo @@ -458,7 +458,9 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable, Elm_Interface_Atspi_Selection.is_child_selected; Elm_Interface_Atspi_Selection.all_children_select; Elm_Interface_Atspi_Selection.clear; + //TIZEN_ONLY(20160329): list: enhance accessibility scroll and highlight (02c20ee39a0ebbe67b9e1491ccfc46dd681821c9) Elm_Interface_Scrollable.content_pos_set; + // } events { activated; diff --git a/src/lib/elm_list_item.eo b/src/lib/elm_list_item.eo index c08c7ba..aed2876 100644 --- a/src/lib/elm_list_item.eo +++ b/src/lib/elm_list_item.eo @@ -119,7 +119,9 @@ class Elm.List_Item(Elm.Widget_Item) Elm_Interface_Atspi_Accessible.name.get; Elm_Interface_Atspi_Accessible.state_set.get; Elm_Interface_Atspi_Accessible.children.get; + //TIZEN_ONLY(20160329): list: enhance accessibility scroll and highlight (02c20ee39a0ebbe67b9e1491ccfc46dd681821c9) Elm_Interface_Atspi_Component.highlight_grab; + // } } diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c index 9ef776d..6cea2ac 100644 --- a/src/lib/elm_main.c +++ b/src/lib/elm_main.c @@ -1774,7 +1774,7 @@ elm_object_focus_region_show_mode_get(const Evas_Object *obj) { return elm_widget_focus_region_show_mode_get(obj); } - +//TIZEN_ONLY(20160329): win: add accessibility highlight (d4753268ad02d0c25c16f815003c70b158879ca7) EAPI void elm_object_accessibility_highlight_set(Evas_Object *obj, Eina_Bool visible) { @@ -1793,3 +1793,4 @@ elm_object_accessibility_highlight_set(Evas_Object *obj, Eina_Bool visible) else if (visible) _elm_win_accessibility_highlight_set(win, obj); } +// diff --git a/src/lib/elm_object.h b/src/lib/elm_object.h index 13be49b..de740ac 100644 --- a/src/lib/elm_object.h +++ b/src/lib/elm_object.h @@ -508,6 +508,7 @@ EAPI void elm_object_orientation_mode_disabled_set(Evas_Object *obj, Eina */ EAPI Eina_Bool elm_object_orientation_mode_disabled_get(const Evas_Object *obj); +//TIZEN_ONLY(20160329): win: add accessibility highlight (d4753268ad02d0c25c16f815003c70b158879ca7) /** * Set accessibility highlight on object. * @@ -526,3 +527,4 @@ EAPI Eina_Bool elm_object_orientation_mode_disabled_get(const Evas_Object *obj * @ingroup General */ EAPI void elm_object_accessibility_highlight_set(Evas_Object *obj, Eina_Bool val); +// diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c index 0765d96..ce0a062 100644 --- a/src/lib/elm_widget.c +++ b/src/lib/elm_widget.c @@ -4670,6 +4670,7 @@ _elm_widget_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_item, Elm_Widget_Item_Data *item EINA_UNUSED) { Elm_Atspi_State_Set states = 0; + //TIZEN_ONLY(20160329): atspi: implement HighlightGrab and HighlightClear methods (29e253e2f7ef3c632ac3a64c489bf569df407f30) Evas_Object *win = elm_widget_top_get(item->widget); if (win && eo_isa(win, ELM_WIN_CLASS)) { @@ -4677,8 +4678,9 @@ _elm_widget_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_item, STATE_TYPE_SET(states, ELM_ATSPI_STATE_HIGHLIGHTED); } - STATE_TYPE_SET(states, ELM_ATSPI_STATE_FOCUSABLE); STATE_TYPE_SET(states, ELM_ATSPI_STATE_HIGHLIGHTABLE); + // + STATE_TYPE_SET(states, ELM_ATSPI_STATE_FOCUSABLE); if (elm_object_item_focus_get(eo_item)) STATE_TYPE_SET(states, ELM_ATSPI_STATE_FOCUSED); @@ -5860,6 +5862,7 @@ _elm_widget_elm_interface_atspi_component_focus_grab(Eo *obj, Elm_Widget_Smart_D return EINA_FALSE; } +//TIZEN_ONLY(20160329): atspi: implement HighlightGrab and HighlightClear methods (29e253e2f7ef3c632ac3a64c489bf569df407f30) EOLIAN static Eina_Bool _elm_widget_elm_interface_atspi_component_highlight_grab(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) { @@ -5875,6 +5878,7 @@ _elm_widget_elm_interface_atspi_component_highlight_clear(Eo *obj, Elm_Widget_Sm elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_HIGHLIGHTED, EINA_FALSE); return EINA_TRUE; } +// EOLIAN static char* _elm_widget_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED) @@ -5891,6 +5895,7 @@ _elm_widget_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Wid return _elm_util_mkup_to_text(ret); } +//TIZEN_ONLY(20160329): widget: sort accessible children spatially (d940068e1f7cc5cfc6208245a1fb0e92f1a813d4) static int _sort_vertically(const void *data1, const void *data2) { Evas_Coord y1, y2; @@ -5939,6 +5944,7 @@ static Eina_List *_lines_split(Eina_List *children) return eina_list_append(lines, line); } +// EOLIAN static Eina_List* _elm_widget_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd EINA_UNUSED) @@ -5983,6 +5989,7 @@ _elm_widget_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Widget_Sma eo_do_super(obj, ELM_WIDGET_CLASS, states = elm_interface_atspi_accessible_state_set_get()); + //TIZEN_ONLY(20160329): atspi: implement HighlightGrab and HighlightClear methods (29e253e2f7ef3c632ac3a64c489bf569df407f30) Evas_Object *win = elm_widget_top_get(obj); if (win && eo_isa(win, ELM_WIN_CLASS)) { @@ -5990,6 +5997,7 @@ _elm_widget_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Widget_Sma STATE_TYPE_SET(states, ELM_ATSPI_STATE_HIGHLIGHTED); } STATE_TYPE_SET(states, ELM_ATSPI_STATE_HIGHLIGHTABLE); + // if (evas_object_visible_get(obj)) { @@ -6073,6 +6081,7 @@ _elm_widget_item_elm_interface_atspi_component_focus_grab(Eo *obj EINA_UNUSED, E return elm_object_item_focus_get(obj); } +//TIZEN_ONLY(20160329): atspi: implement HighlightGrab and HighlightClear methods (29e253e2f7ef3c632ac3a64c489bf569df407f30) EOLIAN static Eina_Bool _elm_widget_item_elm_interface_atspi_component_highlight_grab(Eo *obj, Elm_Widget_Item_Data *sd) { @@ -6101,6 +6110,7 @@ _elm_widget_item_elm_interface_atspi_component_highlight_clear(Eo *obj, Elm_Widg } return EINA_FALSE; } +// EOLIAN static double _elm_widget_item_elm_interface_atspi_component_alpha_get(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED) @@ -6112,6 +6122,7 @@ _elm_widget_item_elm_interface_atspi_component_alpha_get(Eo *obj EINA_UNUSED, El return (double)alpha / 255.0; } +//TIZEN_ONLY(20160329): widget: improve accessibile_at_point getter (a8aff0423202b9a55dbb3843205875226678fbd6) EOLIAN static Eo * _elm_widget_elm_interface_atspi_component_accessible_at_point_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, Eina_Bool screen_coords, int x, int y) { @@ -6177,6 +6188,7 @@ _elm_widget_elm_interface_atspi_component_accessible_at_point_get(Eo *obj, Elm_W eina_list_free(stack); return NULL; } +// #include "elm_widget_item.eo.c" #include "elm_widget.eo.c" diff --git a/src/lib/elm_widget.eo b/src/lib/elm_widget.eo index 5b6d864..88fdbc6 100644 --- a/src/lib/elm_widget.eo +++ b/src/lib/elm_widget.eo @@ -772,9 +772,13 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte Elm_Interface_Atspi_Accessible.parent.get; Elm_Interface_Atspi_Accessible.attributes.get; Elm_Interface_Atspi_Component.focus_grab; + //TIZEN_ONLY(20160329): atspi: implement HighlightGrab and HighlightClear methods (29e253e2f7ef3c632ac3a64c489bf569df407f30) Elm_Interface_Atspi_Component.highlight_grab; Elm_Interface_Atspi_Component.highlight_clear; + // + //TIZEN_ONLY(20160329): widget: improve accessibile_at_point getter (a8aff0423202b9a55dbb3843205875226678fbd6) Elm_Interface_Atspi_Component.accessible_at_point_get; + // } events { moved; diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h index f8fec1a..b0fd06e 100644 --- a/src/lib/elm_widget.h +++ b/src/lib/elm_widget.h @@ -542,8 +542,10 @@ void _elm_win_focus_highlight_in_theme_update(Evas_Object *obj, Evas_Object *_elm_win_focus_highlight_object_get(Evas_Object *obj); void _elm_win_focus_auto_show(Evas_Object *obj); void _elm_win_focus_auto_hide(Evas_Object *obj); +//TIZEN_ONLY(20160329): win: add accessibility highlight (d4753268ad02d0c25c16f815003c70b158879ca7) void _elm_win_accessibility_highlight_set(Evas_Object *win, Evas_Object *obj); Evas_Object *_elm_win_accessibility_highlight_get(Evas_Object *win); +// EAPI void _elm_access_clear(Elm_Access_Info *ac); EAPI void _elm_access_text_set(Elm_Access_Info *ac, int type, const char *text); diff --git a/src/lib/elm_widget_genlist.h b/src/lib/elm_widget_genlist.h index dcf1cce..a02f175 100644 --- a/src/lib/elm_widget_genlist.h +++ b/src/lib/elm_widget_genlist.h @@ -150,7 +150,9 @@ struct _Elm_Genlist_Data Eina_Hash *size_caches; Eina_Bool filter; + //TIZEN_ONLY(20160329): genlist: enhance accessibility scroll & highlight (30d9a6012e629cd9ea60eae8d576f3ebb94ada86) Elm_Gen_Item *atspi_item_to_highlight; + // Eina_Bool focus_on_selection_enabled : 1; Eina_Bool tree_effect_enabled : 1; diff --git a/src/lib/elm_widget_item.eo b/src/lib/elm_widget_item.eo index 0269536..e466965 100644 --- a/src/lib/elm_widget_item.eo +++ b/src/lib/elm_widget_item.eo @@ -536,7 +536,9 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible, Elm_Interface_Atspi_Component.alpha.get; Elm_Interface_Atspi_Component.layer.get; Elm_Interface_Atspi_Component.focus_grab; + //TIZEN_ONLY(20160329): atspi: implement HighlightGrab and HighlightClear methods (29e253e2f7ef3c632ac3a64c489bf569df407f30) Elm_Interface_Atspi_Component.highlight_grab; Elm_Interface_Atspi_Component.highlight_clear; + // } } diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index fa9fbb0..21e993c 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -175,12 +175,14 @@ struct _Elm_Win_Data Eina_Bool auto_enabled : 1; Eina_Bool auto_animate : 1; } focus_highlight; + //TIZEN_ONLY(20160329): win: add accessibility highlight (d4753268ad02d0c25c16f815003c70b158879ca7) struct { Evas_Object *fobj; /*accessibility highlight edje object */ Evas_Object *target; Eina_Bool enabled; } accessibility_highlight; + // Evas_Object *icon; const char *title; @@ -294,8 +296,10 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { static Eina_Bool _key_action_return(Evas_Object *obj, const char *params); static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); +//TIZEN_ONLY(20160329): win: add accessibility highlight (d4753268ad02d0c25c16f815003c70b158879ca7) static void _elm_win_accessibility_highlight_shutdown(Elm_Win_Data *sd); static void _elm_win_accessibility_highlight_update(Elm_Win_Data *sd); +// static const Elm_Action key_actions[] = { {"return", _key_action_return}, @@ -2053,7 +2057,9 @@ _elm_win_evas_object_smart_del(Eo *obj, Elm_Win_Data *sd) } _elm_win_focus_highlight_shutdown(sd); + //TIZEN_ONLY(20160329): win: add accessibility highlight (d4753268ad02d0c25c16f815003c70b158879ca7) _elm_win_accessibility_highlight_shutdown(sd); + // eina_stringshare_del(sd->focus_highlight.style); eina_stringshare_del(sd->title); @@ -6030,6 +6036,7 @@ _elm_win_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Win_Data *sd EINA_ return ret ? strdup(ret) : strdup(""); } +//TIZEN_ONLY(20160329): win: add accessibility highlight (d4753268ad02d0c25c16f815003c70b158879ca7) static void _elm_win_accessibility_highlight_obj_del(void *data, Evas *e EINA_UNUSED, @@ -6191,6 +6198,7 @@ _elm_win_accessibility_highlight_get(Evas_Object *win) ELM_WIN_DATA_GET_OR_RETURN_VAL(win, sd, NULL); return sd->accessibility_highlight.target; } +// #include "elm_win.eo.c"