[orca] Mouse review: Take current document into account when looking for items



commit 28329681b1d441f5228c08325f77ed1c059e825c
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Jun 17 16:48:07 2019 -0400

    Mouse review: Take current document into account when looking for items

 src/orca/mouse_review.py     | 2 ++
 src/orca/script_utilities.py | 3 +++
 2 files changed, 5 insertions(+)
---
diff --git a/src/orca/mouse_review.py b/src/orca/mouse_review.py
index bd5ee3f71..7e72569f6 100644
--- a/src/orca/mouse_review.py
+++ b/src/orca/mouse_review.py
@@ -403,7 +403,9 @@ class MouseReviewer:
         else:
             menu = pyatspi.findAncestor(orca_state.locusOfFocus, isMenu)
 
+        document = script.utilities.activeDocument()
         obj = script.utilities.descendantAtPoint(menu, pX, pY) \
+            or script.utilities.descendantAtPoint(document, pX, pY) \
             or script.utilities.descendantAtPoint(window, pX, pY)
         msg = "MOUSE REVIEW: Object at (%i, %i) is %s" % (pX, pY, obj)
         debug.println(debug.LEVEL_INFO, msg, True)
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index 0a124e228..112c69baa 100644
--- a/src/orca/script_utilities.py
+++ b/src/orca/script_utilities.py
@@ -1169,6 +1169,9 @@ class Utilities:
         obj = obj or orca_state.locusOfFocus
         return self.getContainingDocument(obj) is not None
 
+    def activeDocument(self):
+        return self.getContainingDocument(orca_state.locusOfFocus)
+
     def getContainingDocument(self, obj):
         if not obj:
             return None


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