From fcb7547176a0ccac466a2dc248dbd1509f23e020 Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Fri, 19 Apr 2013 12:55:55 +0900 Subject: [PATCH] [plug][access] bug fix in smart_activate(), add HIGHLIGHT_NEXT/PREV, UNHIGHLIGHT Change-Id: I244cf9302a98fe84f17e799c7f682792d40c5246 --- src/lib/elm_plug.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/lib/elm_plug.c b/src/lib/elm_plug.c index ba190eb..1c5d498 100644 --- a/src/lib/elm_plug.c +++ b/src/lib/elm_plug.c @@ -198,7 +198,7 @@ _elm_plug_smart_activate(Evas_Object *obj, Elm_Activate act) action_info->action_type = msg_id; ecore_evas_msg_parent_send(ee, MSG_DOMAIN_CONTROL_ACCESS, - msg_id, &action_info, sizeof(Elm_Access_Action_Info)); + msg_id, action_info, sizeof(Elm_Access_Action_Info)); free(action_info); return EINA_TRUE; @@ -254,13 +254,18 @@ _access_action_highlight_cb(void *data __UNUSED__, ee = _elm_plug_ecore_evas_get(obj); if (!ee) return EINA_FALSE; - elm_access_action_cb_set(obj, ELM_ACCESS_ACTION_HIGHLIGHT_NEXT, - _access_action_highlight_next_cb, NULL); + if (action_info->action_type == ELM_ACCESS_ACTION_HIGHLIGHT) + { + elm_access_action_cb_set(obj, ELM_ACCESS_ACTION_HIGHLIGHT_NEXT, + _access_action_highlight_next_cb, NULL); + elm_access_action_cb_set(obj, ELM_ACCESS_ACTION_HIGHLIGHT_PREV, + _access_action_highlight_next_cb, NULL); + } ecore_evas_msg_parent_send(ee, MSG_DOMAIN_CONTROL_ACCESS, - ELM_ACCESS_ACTION_HIGHLIGHT, + action_info->action_type, action_info, sizeof(Elm_Access_Action_Info)); - return EINA_FALSE; + return EINA_TRUE; } EAPI Evas_Object * @@ -282,6 +287,8 @@ elm_plug_add(Evas_Object *parent) _elm_access_object_register(obj, ELM_WIDGET_DATA(sd)->resize_obj); elm_access_action_cb_set(obj, ELM_ACCESS_ACTION_HIGHLIGHT, _access_action_highlight_cb, NULL); + elm_access_action_cb_set(obj, ELM_ACCESS_ACTION_UNHIGHLIGHT, + _access_action_highlight_cb, NULL); return obj; } -- 2.7.4