Merge a47fcc6 into f8df880

josephsl · web-flow · commit 3515249bf673 · 2021-10-17T11:57:47.000+10: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-2020 NV Access Limited, Joseph Lee, Łukasz Golonka, Julien Cochuyt
+# Copyright (C) 2006-2021 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.
 
@@ -341,7 +341,13 @@ def chooseNVDAObjectOverlayClasses(self, obj, clsList):
 				clsList.insert(0, ImmersiveLauncher)
 			elif uiaClassName == "ListViewItem" and obj.UIAElement.cachedAutomationId.startswith('Suggestion_'):
 				clsList.insert(0, SuggestionListItem)
-			elif uiaClassName == "MultitaskingViewFrame" and role == controlTypes.Role.WINDOW:
+			# Multitasking view frame window
+			elif (
+				# Windows 10 and earlier
+				(uiaClassName == "MultitaskingViewFrame" and role == controlTypes.Role.WINDOW)
+				# Windows 11 where a pane window receives focus when switching tasks
+				or (uiaClassName == "Windows.UI.Input.InputSite.WindowClass" and role == controlTypes.Role.PANE)
+			):
 				clsList.insert(0, MultitaskingViewFrameWindow)
 			# Windows 10 task switch list
 			elif role == controlTypes.Role.LISTITEM and (
