[orca] Eliminate some false positives with find toolbar



commit b9d3382bdd780394edbf356bf3e371838e7a95f6
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Feb 24 23:22:43 2016 -0500

    Eliminate some false positives with find toolbar

 src/orca/scripts/web/script.py           |   13 +++++++++----
 src/orca/scripts/web/script_utilities.py |    3 +++
 2 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/src/orca/scripts/web/script.py b/src/orca/scripts/web/script.py
index ccf5a08..8b00c05 100644
--- a/src/orca/scripts/web/script.py
+++ b/src/orca/scripts/web/script.py
@@ -1208,10 +1208,15 @@ class Script(default.Script):
             self.utilities.setCaretContext(event.source, event.detail1)
             return True
 
-        if self.utilities.inFindToolbar() and not self._madeFindAnnouncement:
-            msg = "WEB: Event handled: Presenting find results"
-            debug.println(debug.LEVEL_INFO, msg, True)
-            self.presentFindResults(event.source, event.detail1)
+        if self.utilities.inFindToolbar():
+            if not self._madeFindAnnouncement:
+                msg = "WEB: Event handled: Presenting find results"
+                debug.println(debug.LEVEL_INFO, msg, True)
+                self.presentFindResults(event.source, event.detail1)
+            else:
+                self.utilities.setCaretContext(event.source, event.detail1)
+                msg = "WEB: Event handled: Setting context to source and offset"
+                debug.println(debug.LEVEL_INFO, msg, True)
             return True
 
         if self.utilities.eventIsAutocompleteNoise(event):
diff --git a/src/orca/scripts/web/script_utilities.py b/src/orca/scripts/web/script_utilities.py
index d161c8d..7240708 100644
--- a/src/orca/scripts/web/script_utilities.py
+++ b/src/orca/scripts/web/script_utilities.py
@@ -441,6 +441,9 @@ class Utilities(script_utilities.Utilities):
         if not obj:
             obj = orca_state.locusOfFocus
 
+        if self.inDocumentContent(obj):
+            return False
+
         if obj and obj.parent \
            and obj.parent.getRole() == pyatspi.ROLE_AUTOCOMPLETE:
             return False


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]