Merge 0f0dbbd into bc164e2

josephsl · web-flow · commit 45dfc053196a · 2023-01-14T13:50:42.000-08:00
diff --git a/source/appModules/explorer.py b/source/appModules/explorer.py
@@ -1,6 +1,6 @@
 # -*- coding: UTF-8 -*-
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2006-2022 NV Access Limited, Joseph Lee, Łukasz Golonka, Julien Cochuyt
+# Copyright (C) 2006-2023 NV Access Limited, Joseph Lee, Łukasz Golonka, Julien Cochuyt
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
@@ -504,7 +504,7 @@ def event_gainFocus(self, obj, nextHandler):
 
 		nextHandler()
 
-	def isGoodUIAWindow(self, hwnd):
+	def isGoodUIAWindow(self, hwnd: int) -> bool:
 		currentWinVer = winVersion.getWinVer()
 		# #9204: shell raises window open event for emoji panel in build 18305 and later.
 		if (
@@ -528,6 +528,7 @@ def isGoodUIAWindow(self, hwnd):
 				# Top-level window class names from Windows 11 shell features
 				"Shell_InputSwitchTopLevelWindow",  # Language switcher
 				"XamlExplorerHostIslandWindow",  # Task View and Snap Layouts
+				"TopLevelWindowForOverflowXamlIsland",  # #14539: redesigned systray overflow in 22H2
 			)
 			# #13717: on some systems, Windows 11 shell elements are reported as IAccessible,
 			# notably Start button, causing IAccessible handler to report attribute error when handling events.
diff --git a/source/appModules/openwith.py b/source/appModules/openwith.py
@@ -1,5 +1,5 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2011-2022 NV Access Limited, Joseph Lee
+# Copyright (C) 2011-2023 NV Access Limited, Joseph Lee
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
@@ -40,9 +40,14 @@ def chooseNVDAObjectOverlayClasses(self, obj, clsList):
 			elif automationId == "ImmersiveOpenWithFlyout":
 				clsList.insert(0, ImmersiveOpenWithFlyout)
 
-	def isGoodUIAWindow(self, hwnd):
-		# #11335: Open With dialog isn't read in Windows 10 Version 2004 (May 2020 Update).
-		# Note that treating the below window as a UIA window will make NVDA no longer announce "pane".
-		if winUser.getClassName(hwnd) == "Shell_Flyout":
+	def isGoodUIAWindow(self, hwnd: int) -> bool:
+		if winUser.getClassName(hwnd) in (
+			# #11335: Open With dialog isn't read in Windows 10 Version 2004 (May 2020 Update).
+			# Note that treating the below window as a UIA window will make NVDA no longer announce "pane".
+			"Shell_Flyout",
+			# #14538: Windows 11 Version 22H2 (2022 Update) comes with a modernized Open With dialog
+			# but prevents proper mouse and touch interaction.
+			"Open With",
+		):
 			return True
 		return False
