kimcinoo pushed a commit to branch master.
commit 2f69e58622d2a7b8c0615484898abbb0c0d2099f
Author: Shinwoo Kim <[email protected]>
Date: Fri Mar 8 11:44:49 2013 +0900
[access] do not try to give a highlight, if the object already has a
highlight - use more proper line
---
src/lib/elm_access.c | 37 +++++++++++++++++++++++--------------
1 file changed, 23 insertions(+), 14 deletions(-)
diff --git a/src/lib/elm_access.c b/src/lib/elm_access.c
index 60bdcfc..ffca3f5 100644
--- a/src/lib/elm_access.c
+++ b/src/lib/elm_access.c
@@ -121,11 +121,33 @@ _access_add_set(Elm_Access_Info *ac, int type)
return ai;
}
+static Evas_Object *
+_access_highlight_object_get(Evas_Object *obj)
+{
+ Evas_Object *o, *ho;
+
+ o = evas_object_name_find(evas_object_evas_get(obj), "_elm_access_disp");
+ if (!o) return NULL;
+
+ ho = evas_object_data_get(o, "_elm_access_target");
+
+ return ho;
+}
+
static Eina_Bool
_access_obj_over_timeout_cb(void *data)
{
- Elm_Access_Info *ac = evas_object_data_get(data, "_elm_access");
+ Elm_Access_Info *ac;
+ Evas_Object *ho;
+
+ if (!data) return EINA_FALSE;
+
+ ho = _access_highlight_object_get(data);
+ if (ho == data) return EINA_FALSE;
+
+ ac = evas_object_data_get(data, "_elm_access");
if (!ac) return EINA_FALSE;
+
if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF)
{
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
evas_object_resize(o, w, h);
}
-static Evas_Object *
-_access_highlight_object_get(Evas_Object *obj)
-{
- Evas_Object *o, *ho;
-
- o = evas_object_name_find(evas_object_evas_get(obj), "_elm_access_disp");
- if (!o) return NULL;
-
- ho = evas_object_data_get(o, "_elm_access_target");
-
- return ho;
-}
-
void
_elm_access_mouse_event_enabled_set(Eina_Bool enabled)
{
--
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
