[ATSPI][elc_ctxpopup]: Highlight not changing on swipe issue fix.

Change-Id: I7749f7d6b73f73f50d9d7817fd9bf51e555885dd

diff --git a/src/mobile_lib/elc_ctxpopup.c b/src/mobile_lib/elc_ctxpopup.c
index f85a4e9..f67a4bd 100644 (file)
--- a/src/mobile_lib/elc_ctxpopup.c
+++ b/src/mobile_lib/elc_ctxpopup.c
@@ -2429,15 +2429,15 @@ _elm_ctxpopup_item_elm_interface_atspi_component_highlight_grab(Eo *eo_it, Elm_C
           }
      }
 
-   elm_object_accessibility_highlight_set(VIEW(it), EINA_TRUE);
+   elm_object_accessibility_highlight_set(eo_it, EINA_TRUE);
    elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_HIGHLIGHTED, EINA_TRUE);
    return ret;
 }
 
 EOLIAN static Eina_Bool
-_elm_ctxpopup_item_elm_interface_atspi_component_highlight_clear(Eo *eo_it, Elm_Ctxpopup_Item_Data *it)
+_elm_ctxpopup_item_elm_interface_atspi_component_highlight_clear(Eo *eo_it, Elm_Ctxpopup_Item_Data *it EINA_UNUSED)
 {
-   elm_object_accessibility_highlight_set(VIEW(it), EINA_FALSE);
+   elm_object_accessibility_highlight_set(eo_it, EINA_FALSE);
    elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_HIGHLIGHTED, EINA_FALSE);
 
    return EINA_TRUE;
@@ -2450,8 +2450,15 @@ _content_move_down_cb(void *data, Evas_Object *obj, void *ev EINA_UNUSED)
      return ;
    ELM_CTXPOPUP_DATA_GET(data, pd);
    Elm_Ctxpopup_Item_Data *it_data;
-   Evas_Object * highlighted_obj = _elm_object_accessibility_currently_highlighted_get();
-   Evas_Object * parent = highlighted_obj;
+   Evas_Object *highlighted_obj = _elm_object_accessibility_currently_highlighted_get();
+
+   if (eo_isa(highlighted_obj, ELM_WIDGET_ITEM_CLASS))
+     {
+        Elm_Widget_Item_Data *id = eo_data_scope_get(highlighted_obj, ELM_WIDGET_ITEM_CLASS);
+        highlighted_obj = id->view;
+     }
+
+   Evas_Object *parent = highlighted_obj;
 
    if (eo_isa(highlighted_obj, ELM_WIDGET_CLASS))
      {
@@ -2510,8 +2517,15 @@ _content_move_up_cb(void *data, Evas_Object *obj, void *ev EINA_UNUSED)
      return ;
    ELM_CTXPOPUP_DATA_GET(data, pd);
    Elm_Ctxpopup_Item_Data *it_data;
-   Evas_Object * highlighted_obj = _elm_object_accessibility_currently_highlighted_get();
-   Evas_Object * parent = highlighted_obj;
+   Evas_Object *highlighted_obj = _elm_object_accessibility_currently_highlighted_get();
+
+   if (eo_isa(highlighted_obj, ELM_WIDGET_ITEM_CLASS))
+     {
+        Elm_Widget_Item_Data *id = eo_data_scope_get(highlighted_obj, ELM_WIDGET_ITEM_CLASS);
+        highlighted_obj = id->view;
+     }
+
+   Evas_Object *parent = highlighted_obj;
 
    if (eo_isa(highlighted_obj, ELM_WIDGET_CLASS))
      {