Merge d3b26dc into 33d7b64

feerrenrut · web-flow · commit e7d1ca190ce6 · 2020-09-18T16:29:51.000+02:00
diff --git a/source/eventHandler.py b/source/eventHandler.py
@@ -162,6 +162,7 @@ def _getFocusLossCancellableSpeechCommand(
 ) -> Optional[_CancellableSpeechCommand]:
 	if reason != controlTypes.REASON_FOCUS or not speech.manager._shouldCancelExpiredFocusEvents():
 		return None
+	from NVDAObjects.behaviors import Dialog
 	from NVDAObjects import NVDAObject
 	if not isinstance(obj, NVDAObject):
 		log.warning("Unhandled object type. Expected all objects to be descendant from NVDAObject")
@@ -181,6 +182,8 @@ def isSpeechStillValid():
 			isLastFocusObj()
 			or not previouslyHadFocus()
 			or isAncestorOfCurrentFocus()
+			# Ensure dialogs gaining focus are reported, EG NVDA Find dialog in a browser
+			or isinstance(obj, Dialog)
 		)
 		return stillValid
 
@@ -192,6 +195,7 @@ def getDevInfo():
 			f"isLast: {isLastFocusObj()}"
 			f", previouslyHad: {previouslyHadFocus()}"
 			f", isAncestorOfCurrentFocus: {isAncestorOfCurrentFocus()}"
+			f", is a Dialog: {isinstance(obj, Dialog)}"
 		)
 	return _CancellableSpeechCommand(isSpeechStillValid, getDevInfo)
 
