[orca] Re-present just the locusOfFocus after tooltip has been dismissed

[Joanmarie Diggs <joanied src gnome org>]

commit de88062a3494251c1075a0dbbd8f4a9651220d02
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Tue Dec 1 16:31:34 2015 -0500

    Re-present just the locusOfFocus after tooltip has been dismissed

 src/orca/scripts/default.py  |    2 +-
 src/orca/speech_generator.py |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index 2cc67ed..91dc26e 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -2507,7 +2507,7 @@ class Script(script.Script):
             if orca_state.locusOfFocus and keyString == "F1":
                 obj = orca_state.locusOfFocus
                 self.updateBraille(obj)
-                speech.speak(self.speechGenerator.generateSpeech(obj))
+                speech.speak(self.speechGenerator.generateSpeech(obj, priorObj=event.source))
                 return
 
     def onTextAttributesChanged(self, event):
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index b812ae2..66b450d 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -210,6 +210,10 @@ class SpeechGenerator(generator.Generator):
         if _settingsManager.getSetting('onlySpeakDisplayedText'):
             return []
 
+        priorObj = args.get('priorObj')
+        if priorObj and priorObj.getRole() == pyatspi.ROLE_TOOL_TIP:
+            return []
+
         acss = self.voice(SYSTEM)
         result = generator.Generator._generateDescription(self, obj, **args)
         if result:
@@ -1568,6 +1572,9 @@ class SpeechGenerator(generator.Generator):
         """
         result = []
         priorObj = args.get('priorObj', None)
+        if priorObj and priorObj.getRole() == pyatspi.ROLE_TOOL_TIP:
+            return []
+
         commonAncestor = self._script.utilities.commonAncestor(priorObj, obj)
         try:
             role = commonAncestor.getRole()