[orca] Don't present description for mouse review if tooltip presentation off



commit e9780bc4e01a65ace91e7af5831aaf59c7fca380
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Jul 8 10:24:29 2019 -0400

    Don't present description for mouse review if tooltip presentation off

 src/orca/mouse_review.py     | 4 ++--
 src/orca/speech_generator.py | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/orca/mouse_review.py b/src/orca/mouse_review.py
index f24f718cf..3c8e85cfe 100644
--- a/src/orca/mouse_review.py
+++ b/src/orca/mouse_review.py
@@ -204,14 +204,14 @@ class _ItemContext:
             self._script.presentationInterrupt()
 
         if self._frame and self._frame != prior._frame:
-            self._script.presentObject(self._frame, alreadyFocused=True)
+            self._script.presentObject(self._frame, alreadyFocused=True, inMouseReview=True)
 
         if self._string != prior._string and self._string.present():
             return True
 
         if self._obj and self._obj != prior._obj:
             priorObj = prior._obj or self._getContainer()
-            self._script.presentObject(self._obj, priorObj=priorObj)
+            self._script.presentObject(self._obj, priorObj=priorObj, inMouseReview=True)
 
         return True
 
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index a96d6c04d..0017c55b6 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -212,6 +212,9 @@ class SpeechGenerator(generator.Generator):
         if not _settingsManager.getSetting('speakDescription'):
             return []
 
+        if args.get('inMouseReview') and not _settingsManager.getSetting('presentToolTips'):
+            return []
+
         priorObj = args.get('priorObj')
         if priorObj and priorObj.getRole() == pyatspi.ROLE_TOOL_TIP:
             return []


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