Merge "Region show on item elements fixed" into tizen

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 8264048..e2ce932 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -3,6 +3,7 @@
 #endif
 
 #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED
 #define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED
 #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
 #define ELM_WIDGET_ITEM_PROTECTED
@@ -5586,6 +5587,24 @@ _elm_gengrid_item_elm_interface_atspi_accessible_children_get(Eo *eo_it EINA_UNU
    return ret;
 }
 
+EOLIAN static Eina_Bool
+_elm_gengrid_item_elm_interface_atspi_component_highlight_grab(Eo *eo_it, Elm_Gen_Item *it)
+{
+   elm_gengrid_item_show(eo_it, ELM_GENGRID_ITEM_SCROLLTO_IN);
+
+   elm_object_accessibility_highlight_set(VIEW(it), EINA_TRUE);
+
+   return EINA_TRUE;
+}
+
+EOLIAN static Eina_Bool
+_elm_gengrid_item_elm_interface_atspi_component_highlight_clear(Eo *eo_it, Elm_Gen_Item *it)
+{
+   elm_object_accessibility_highlight_set(VIEW(it), EINA_FALSE);
+
+   return EINA_TRUE;
+}
+
 EAPI Elm_Object_Item *
 elm_gengrid_nth_item_get(const Evas_Object *obj, unsigned int nth)
 {

diff --git a/src/lib/elm_gengrid_item.eo b/src/lib/elm_gengrid_item.eo
index 203fa8c..b80f08f 100644 (file)
--- a/src/lib/elm_gengrid_item.eo
+++ b/src/lib/elm_gengrid_item.eo
@@ -227,5 +227,7 @@ class Elm.Gengrid_Item(Elm.Widget_Item)
            Elm_Interface_Atspi_Accessible.name.get;
            Elm_Interface_Atspi_Accessible.state_set.get;
            Elm_Interface_Atspi_Accessible.children.get;
+           Elm_Interface_Atspi_Component.highlight_grab;
+           Elm_Interface_Atspi_Component.highlight_clear;
       }
 }

diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 0da1a5e..6bbc967 100644 (file)
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -3,6 +3,7 @@
 #endif
 
 #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
+#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED
 #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
 #define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED
 //TIZEN_ONLY(20160329): list: enhance accessibility scroll and highlight (02c20ee39a0ebbe67b9e1491ccfc46dd681821c9)
@@ -2173,6 +2174,14 @@ _elm_list_item_elm_interface_atspi_accessible_children_get(Eo *eo_it EINA_UNUSED
    return ret;
 }
 
+EOLIAN static Eina_Bool
+_elm_list_item_elm_interface_atspi_component_highlight_clear(Eo *eo_it, Elm_List_Item_Data *it)
+{
+   elm_object_accessibility_highlight_set(VIEW(it), EINA_FALSE);
+
+   return EINA_TRUE;
+}
+
 static char *
 _access_info_cb(void *data, Evas_Object *obj EINA_UNUSED)
 {

diff --git a/src/lib/elm_list_item.eo b/src/lib/elm_list_item.eo
index aed2876..ec9f164 100644 (file)
--- a/src/lib/elm_list_item.eo
+++ b/src/lib/elm_list_item.eo
@@ -121,6 +121,7 @@ class Elm.List_Item(Elm.Widget_Item)
            Elm_Interface_Atspi_Accessible.children.get;
            //TIZEN_ONLY(20160329): list: enhance accessibility scroll and highlight (02c20ee39a0ebbe67b9e1491ccfc46dd681821c9)
            Elm_Interface_Atspi_Component.highlight_grab;
+           Elm_Interface_Atspi_Component.highlight_clear;
            //
       }
 }

diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index af4104c..08060e9 100644 (file)
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -6119,37 +6119,6 @@ _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)
-{
-   Evas_Object *win = elm_widget_top_get(sd->widget);
-   if (win && eo_isa(win, ELM_WIN_CLASS))
-     {
-        _elm_win_accessibility_highlight_set(win, sd->view);
-        elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_HIGHLIGHTED, EINA_TRUE);
-        return EINA_TRUE;
-     }
-   return EINA_FALSE;
-}
-
-EOLIAN static Eina_Bool
-_elm_widget_item_elm_interface_atspi_component_highlight_clear(Eo *obj, Elm_Widget_Item_Data *sd)
-{
-   Evas_Object *win = elm_widget_top_get(sd->widget);
-   if (win && eo_isa(win, ELM_WIN_CLASS))
-     {
-        if (_elm_win_accessibility_highlight_get(win) != sd->view)
-          return EINA_TRUE;
-
-        _elm_win_accessibility_highlight_set(win, NULL);
-        elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_HIGHLIGHTED, EINA_FALSE);
-        return EINA_TRUE;
-     }
-   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)
 {

diff --git a/src/lib/elm_widget_item.eo b/src/lib/elm_widget_item.eo
index bd1f99d..2a13c6c 100644 (file)
--- a/src/lib/elm_widget_item.eo
+++ b/src/lib/elm_widget_item.eo
@@ -544,9 +544,5 @@ 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;
-           //
       }
 }