From 6bc5c82165f6c79aec893fe888298faa7f0474ab Mon Sep 17 00:00:00 2001 From: Shilpa Singh Date: Wed, 14 Sep 2016 15:08:01 +0530 Subject: [PATCH] [ATSPI]: Active descendent changed signal not sent issue fix. Due to which highlight on genlist items was not setting to correct item(highlight jumping) during scroll. Change-Id: If4e37bafaa50a0a5c61bc67602c87e08574ef902 --- src/lib/elm_atspi_bridge.c | 4 +++- src/lib/elm_gengrid.c | 4 ++-- src/lib/elm_genlist.c | 4 ++-- src/lib/elm_toolbar.c | 4 ++-- src/mobile_lib/elm_genlist.c | 12 ++++++------ 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/lib/elm_atspi_bridge.c b/src/lib/elm_atspi_bridge.c index d1b7d054e..04e08db20 100644 --- a/src/lib/elm_atspi_bridge.c +++ b/src/lib/elm_atspi_bridge.c @@ -4140,7 +4140,9 @@ _active_descendant_changed_signal_send(void *data, Eo *obj, const Eo_Event_Descr ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); - if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED)) + //TIZEN_ONLY(20160914): Issue fix, correct the object pointer for which state was checked. + if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED)) + // return EINA_FALSE; eo_do(child, idx = elm_interface_atspi_accessible_index_in_parent_get()); diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index d265fef7b..5d5ea8708 100644 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@ -5765,7 +5765,7 @@ _elm_gengrid_item_elm_interface_atspi_component_highlight_grab(Eo *eo_it, Elm_Ge sd->atspi_item_to_highlight = it;//it will be highlighted when realized ///TIZEN_ONLY(20170717) : expose highlight information on atspi - eo_do(WIDGET(it), eo_event_callback_call(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, eo_it)); + elm_interface_atspi_accessible_active_descendant_changed_signal_emit(WIDGET(it), eo_it); /// return EINA_TRUE; @@ -5781,7 +5781,7 @@ _elm_gengrid_item_elm_interface_atspi_component_highlight_clear(Eo *eo_it, Elm_G // elm_object_accessibility_highlight_set(VIEW(it), EINA_FALSE); ///TIZEN_ONLY(20170717) : expose highlight information on atspi - eo_do(WIDGET(it), eo_event_callback_call(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, eo_it)); + elm_interface_atspi_accessible_active_descendant_changed_signal_emit(WIDGET(it), eo_it); /// return EINA_TRUE; diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index ebbfd851e..9633601e7 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -8670,7 +8670,7 @@ _elm_genlist_item_elm_interface_atspi_component_highlight_grab(Eo *eo_it, Elm_Ge else sd->atspi_item_to_highlight = it;//it will be highlighted when realized - eo_do(WIDGET(it), eo_event_callback_call(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, eo_it)); + elm_interface_atspi_accessible_active_descendant_changed_signal_emit(WIDGET(it), eo_it); return ret; } @@ -8683,7 +8683,7 @@ _elm_genlist_item_elm_interface_atspi_component_highlight_clear(Eo *eo_it, Elm_G if (sd->atspi_item_to_highlight == it) sd->atspi_item_to_highlight = NULL; - eo_do(WIDGET(it), eo_event_callback_call(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, eo_it)); + elm_interface_atspi_accessible_active_descendant_changed_signal_emit(WIDGET(it), eo_it); eo_do_super(eo_it, ELM_GENLIST_ITEM_CLASS, ret = elm_interface_atspi_component_highlight_clear()); return ret; diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index 95b93db68..1b3488c12 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -4148,7 +4148,7 @@ _elm_toolbar_item_elm_interface_atspi_component_highlight_grab(Eo *eo_it, Elm_To elm_object_accessibility_highlight_set(VIEW(it), EINA_TRUE); ///TIZEN_ONLY(20170717) : expose highlight information on atspi - eo_do(WIDGET(it), eo_event_callback_call(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, eo_it)); + elm_interface_atspi_accessible_active_descendant_changed_signal_emit(WIDGET(it), eo_it); /// return EINA_TRUE; } @@ -4158,7 +4158,7 @@ _elm_toolbar_item_elm_interface_atspi_component_highlight_clear(Eo *eo_it, Elm_T { elm_object_accessibility_highlight_set(VIEW(it), EINA_FALSE); ///TIZEN_ONLY(20170717) : expose highlight information on atspi - eo_do(WIDGET(it), eo_event_callback_call(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, eo_it)); + elm_interface_atspi_accessible_active_descendant_changed_signal_emit(WIDGET(it), eo_it); /// return EINA_TRUE; } diff --git a/src/mobile_lib/elm_genlist.c b/src/mobile_lib/elm_genlist.c index 0ec177afe..a9122c5d2 100644 --- a/src/mobile_lib/elm_genlist.c +++ b/src/mobile_lib/elm_genlist.c @@ -2575,7 +2575,7 @@ static void _item_focused(Elm_Gen_Item *it, Elm_Genlist_Item_Scrollto_Type type) sd->focused_item = it; evas_object_smart_callback_call(WIDGET(it), SIG_ITEM_FOCUSED, EO_OBJ(it)); if (_elm_config->atspi_mode) - eo_do(WIDGET(it), eo_event_callback_call(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, EO_OBJ(it))); + elm_interface_atspi_accessible_active_descendant_changed_signal_emit(WIDGET(it), EO_OBJ(it)); } #ifndef ELM_FEATURE_WEARABLE @@ -2667,7 +2667,7 @@ _item_highlight(Elm_Gen_Item *it) //**************************** evas_object_smart_callback_call(WIDGET(it), SIG_HIGHLIGHTED, EO_OBJ(it)); if (_elm_config->atspi_mode) - eo_do(WIDGET(it), eo_event_callback_call(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, EO_OBJ(it))); + elm_interface_atspi_accessible_active_descendant_changed_signal_emit(WIDGET(it), EO_OBJ(it)); } static void @@ -6665,7 +6665,7 @@ _elm_genlist_item_expanded_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_B edje_object_signal_emit(VIEW(it), SIGNAL_EXPANDED, "elm"); evas_object_smart_callback_call(WIDGET(it), SIG_EXPANDED, EO_OBJ(it)); if (_elm_config->atspi_mode) - eo_do(WIDGET(it), eo_event_callback_call(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, eo_item)); + elm_interface_atspi_accessible_active_descendant_changed_signal_emit(WIDGET(it), eo_item); } else { @@ -6673,7 +6673,7 @@ _elm_genlist_item_expanded_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_B edje_object_signal_emit(VIEW(it), SIGNAL_CONTRACTED, "elm"); evas_object_smart_callback_call(WIDGET(it), SIG_CONTRACTED, EO_OBJ(it)); if (_elm_config->atspi_mode) - eo_do(WIDGET(it), eo_event_callback_call(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, eo_item)); + elm_interface_atspi_accessible_active_descendant_changed_signal_emit(WIDGET(it), eo_item); } } @@ -8060,7 +8060,7 @@ _elm_genlist_item_elm_interface_atspi_component_highlight_grab(Eo *eo_it, Elm_Ge sd->atspi_item_to_highlight = it;//it will be highlighted when realized ///TIZEN_ONLY(20170717) : expose highlight information on atspi - eo_do(WIDGET(it), eo_event_callback_call(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, eo_it)); + elm_interface_atspi_accessible_active_descendant_changed_signal_emit(WIDGET(it), eo_it); /// return EINA_TRUE; @@ -8074,7 +8074,7 @@ _elm_genlist_item_elm_interface_atspi_component_highlight_clear(Eo *eo_it, Elm_G sd->atspi_item_to_highlight = NULL; elm_object_accessibility_highlight_set(VIEW(it), EINA_FALSE); ///TIZEN_ONLY(20170717) : expose highlight information on atspi - eo_do(WIDGET(it), eo_event_callback_call(ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, eo_it)); + elm_interface_atspi_accessible_active_descendant_changed_signal_emit(WIDGET(it), eo_it); /// return EINA_TRUE; -- 2.34.1