Remove highlight after disabling screen-reader

Change-Id: I0363ee5c64682d8b6ca6994f74a5dfdaf4c4fd97

diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 5c980d7..c8bb4d0 100644 (file)
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -4415,9 +4415,13 @@ _elm_win_screen_reader(Eina_Bool is_screen_reader)
 
         if (!is_screen_reader)
           {
-             efl_access_component_highlight_clear(obj);
+             Evas_Object *ptr = _elm_object_accessibility_currently_highlighted_get();
+             if (ptr) {
+               efl_access_component_highlight_clear(ptr);
+             }
           }
      }
+
 }
 //
 

diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index fb71251..8ccd105 100644 (file)
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -2053,11 +2053,6 @@ elm_object_accessibility_highlight_set(void *obj, Eina_Bool visible)
         _elm_win_object_set_accessibility_highlight(win, target, visible);
      }
 
-   // if (!visible && (obj == _elm_win_accessibility_highlight_get(win)))
-   //    _elm_win_accessibility_highlight_set(win, NULL);
-   // else if (visible)
-   //    _elm_win_accessibility_highlight_set(win, obj);
-   //
 }
 //