[access] make access object unfocusable, when accessibility is disabled

diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 8b36108..8c00e7f 100644 (file)
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1268,3 +1268,7 @@
 2013-04-18  Shinwoo Kim
 
         * Add elm_access_action(), elm_access_action_cb_set()
+
+2013-04-22  Shinwoo Kim
+
+        * Make access object unfocusable when Aaccessibility is disabled.

diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index c8c9f56..54a9f05 100644 (file)
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -211,6 +211,7 @@ Fixes:
    * Fix the calculation double type number.
    * Fix the policy is not changed when the theme is changed.
    * When entry is disabled, scrolling is also disabled.
+   * Make access object unfocusable when Aaccessibility is disabled.
 
 Removals:
 

diff --git a/legacy/elementary/src/lib/elm_access.c b/legacy/elementary/src/lib/elm_access.c
index d0b1800..1db4393 100644 (file)
--- a/legacy/elementary/src/lib/elm_access.c
+++ b/legacy/elementary/src/lib/elm_access.c
@@ -32,7 +32,7 @@ _elm_access_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
 {
    eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
 
-   elm_widget_can_focus_set(obj, EINA_TRUE);
+   elm_widget_can_focus_set(obj, _elm_config->access_mode);
 }
 
 static Eina_Bool
@@ -1294,6 +1294,14 @@ elm_access_external_info_get(const Evas_Object *obj)
 }
 
 static void
+_elm_access_smart_access(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
+{
+   Eina_Bool is_access = va_arg(*list, int);
+
+   elm_widget_can_focus_set(obj, is_access);
+}
+
+static void
 _class_constructor(Eo_Class *klass)
 {
    const Eo_Op_Func_Description func_desc[] = {
@@ -1303,6 +1311,7 @@ _class_constructor(Eo_Class *klass)
 
         EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ON_FOCUS), _elm_access_smart_on_focus),
         EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACTIVATE), _elm_access_smart_activate),
+        EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS), _elm_access_smart_access),
 
         EO_OP_FUNC_SENTINEL
    };