Merge 0f2f46b into 6fc6637

lukaszgo1 · web-flow · commit 08177c10d3f6 · 2019-12-03T07:05:29.000+10:00
diff --git a/source/appModules/explorer.py b/source/appModules/explorer.py
@@ -195,6 +195,21 @@ def _get_TextInfo(cls):
 		return cls.TextInfo
 
 
+class WorkerW(IAccessible):
+	def event_gainFocus(self):
+		# #6671: Normally we do not allow WorkerW thread to send gain focus event,
+		# as it causes 'pane" to be announced when minimizing windows or moving to desktop.
+		# However when closing Windows 7 Start Menu in some  cases
+		# focus lands  on it instead of the focused desktop item.
+		# Therefore redirect it to the child which is a desktop in this case.
+		if eventHandler.isPendingEvents("gainFocus"):
+			return
+		if self.firstChild:
+			self.firstChild.setFocus()
+			return
+		super().event_gainFocus()
+
+
 class AppModule(appModuleHandler.AppModule):
 
 	def chooseNVDAObjectOverlayClasses(self, obj, clsList):
@@ -247,6 +262,10 @@ def chooseNVDAObjectOverlayClasses(self, obj, clsList):
 			clsList.insert(0, MetadataEditField)
 			return  # Optimization: return early to avoid comparing class names and roles that will never match.
 
+		if windowClass== "WorkerW" and role == controlTypes.ROLE_PANE and obj.name is None:
+			clsList.insert(0, WorkerW)
+			return  # Optimization: return early to avoid comparing class names and roles that will never match.
+
 		if isinstance(obj, UIA):
 			uiaClassName = obj.UIAElement.cachedClassName
 			if uiaClassName == "GridTileElement":
@@ -330,10 +349,6 @@ def event_gainFocus(self, obj, nextHandler):
 			# #8137: also seen when opening quick link menu (Windows+X) on Windows 8 and later.
 			return
 
-		if wClass == "WorkerW" and obj.role == controlTypes.ROLE_PANE and obj.name is None:
-			# #6671: Never allow WorkerW thread to send gain focus event, as it causes 'pane" to be announced when minimizing windows or moving to desktop.
-			return
-
 		nextHandler()
 
 	def isGoodUIAWindow(self, hwnd):
