Merge be7973f into 8cbdb79

josephsl · web-flow · commit a4b3ba4c1a53 · 2022-04-21T11:46:40.000+10:00
diff --git a/source/appModules/searchui.py b/source/appModules/searchui.py
@@ -1,9 +1,11 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2015-2021 NV Access Limited, Joseph Lee
+# Copyright (C) 2015-2022 NV Access Limited, Joseph Lee
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
 """App module for Start menu/Windows Search/Cortana user interface in Windows 10 Version 1909 and earlier.
+This app module also serves as the basis for Start menu in Windows 10 Version 2004 and later
+as well as Windows 11, represented by alias app modules.
 """
 
 import appModuleHandler
@@ -12,11 +14,13 @@
 from NVDAObjects.IAccessible import IAccessible, ContentGenericClient
 from NVDAObjects.UIA import UIA, SearchField, SuggestionListItem
 
+
 class StartMenuSearchField(SearchField):
 
 	# #7370: do not announce text when start menu (searchui) closes.
 	announceNewLineText = False
 
+
 class AppModule(appModuleHandler.AppModule):
 
 	def event_NVDAObject_init(self, obj):
@@ -32,7 +36,7 @@ def event_NVDAObject_init(self, obj):
 			):
 				obj.name = obj.firstChild.name
 
-	def chooseNVDAObjectOverlayClasses(self,obj,clsList):
+	def chooseNVDAObjectOverlayClasses(self, obj, clsList):
 		if isinstance(obj, IAccessible):
 			try:
 				# #5288: Never use ContentGenericClient, as this uses displayModel
@@ -44,6 +48,12 @@ def chooseNVDAObjectOverlayClasses(self,obj,clsList):
 			if obj.UIAAutomationId == "SearchTextBox":
 				clsList.insert(0, StartMenuSearchField)
 			# #10329: Since 2019, some suggestion items are grouped inside another suggestions list item.
+			# #13544: grandparent must be checked due to redesign in 2019.
 			# Because of this, result details will not be announced like in the past.
-			elif obj.role == controlTypes.Role.LISTITEM and isinstance(obj.parent, SuggestionListItem):
+			elif (
+				obj.role == controlTypes.Role.LISTITEM and (
+					isinstance(obj.parent, SuggestionListItem)
+					or isinstance(obj.parent.parent, SuggestionListItem)
+				)
+			):
 				clsList.insert(0, SuggestionListItem)
