summaryrefslogtreecommitdiff
path: root/legacy/elementary/src/lib/elm_access.c
diff options
context:
space:
mode:
authorShinwoo Kim <cinoo.kim@samsung.com>2013-03-08 11:44:49 +0900
committerShinwoo Kim <cinoo.kim@samsung.com>2013-03-08 11:44:49 +0900
commit0d05c1aeb40889b7c8a76da87fa72e7e10cd6819 (patch)
tree1809c5294a48014dbdd35c646a4b9da872a2ae9c /legacy/elementary/src/lib/elm_access.c
parent5858baf6e0855ef3a8ac7d433232ac3ef885f199 (diff)
[access] do not try to give a highlight, if the object already has a highlight - use more proper line
Diffstat (limited to 'legacy/elementary/src/lib/elm_access.c')
-rw-r--r--legacy/elementary/src/lib/elm_access.c37
1 files changed, 23 insertions, 14 deletions
diff --git a/legacy/elementary/src/lib/elm_access.c b/legacy/elementary/src/lib/elm_access.c
index 60bdcfc..ffca3f5 100644
--- a/legacy/elementary/src/lib/elm_access.c
+++ b/legacy/elementary/src/lib/elm_access.c
@@ -121,11 +121,33 @@ _access_add_set(Elm_Access_Info *ac, int type)
121 return ai; 121 return ai;
122} 122}
123 123
124static Evas_Object *
125_access_highlight_object_get(Evas_Object *obj)
126{
127 Evas_Object *o, *ho;
128
129 o = evas_object_name_find(evas_object_evas_get(obj), "_elm_access_disp");
130 if (!o) return NULL;
131
132 ho = evas_object_data_get(o, "_elm_access_target");
133
134 return ho;
135}
136
124static Eina_Bool 137static Eina_Bool
125_access_obj_over_timeout_cb(void *data) 138_access_obj_over_timeout_cb(void *data)
126{ 139{
127 Elm_Access_Info *ac = evas_object_data_get(data, "_elm_access"); 140 Elm_Access_Info *ac;
141 Evas_Object *ho;
142
143 if (!data) return EINA_FALSE;
144
145 ho = _access_highlight_object_get(data);
146 if (ho == data) return EINA_FALSE;
147
148 ac = evas_object_data_get(data, "_elm_access");
128 if (!ac) return EINA_FALSE; 149 if (!ac) return EINA_FALSE;
150
129 if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF) 151 if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF)
130 { 152 {
131 if (ac->on_highlight) ac->on_highlight(ac->on_highlight_data); 153 if (ac->on_highlight) ac->on_highlight(ac->on_highlight_data);
@@ -252,19 +274,6 @@ _access_obj_hilight_resize_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Ob
252 evas_object_resize(o, w, h); 274 evas_object_resize(o, w, h);
253} 275}
254 276
255static Evas_Object *
256_access_highlight_object_get(Evas_Object *obj)
257{
258 Evas_Object *o, *ho;
259
260 o = evas_object_name_find(evas_object_evas_get(obj), "_elm_access_disp");
261 if (!o) return NULL;
262
263 ho = evas_object_data_get(o, "_elm_access_target");
264
265 return ho;
266}
267
268void 277void
269_elm_access_mouse_event_enabled_set(Eina_Bool enabled) 278_elm_access_mouse_event_enabled_set(Eina_Bool enabled)
270{ 279{