Merge 4f94fc0 into 7776fc0

josephsl · web-flow · commit 446587212525 · 2025-06-24T05:31:01.000Z
diff --git a/source/UIAHandler/__init__.py b/source/UIAHandler/__init__.py
@@ -1021,12 +1021,12 @@ def IUIAutomationPropertyChangedEventHandler_HandlePropertyChangedEvent(
 
 	def IUIAutomationNotificationEventHandler_HandleNotificationEvent(
 		self,
-		sender,
-		NotificationKind,
-		NotificationProcessing,
-		displayString,
-		activityId,
-	):
+		sender: UIA.IUIAutomationElement,
+		NotificationKind: int,
+		NotificationProcessing: int,
+		displayString: str,
+		activityId: str,
+	) -> None:
 		if _isDebug():
 			log.debug(
 				"handleNotificationEvent called "
@@ -1041,10 +1041,42 @@ def IUIAutomationNotificationEventHandler_HandleNotificationEvent(
 			if _isDebug():
 				log.debug("HandleNotificationEvent: event received while not fully initialized")
 			return
+		# Sometimes notification events can be fired on a UIAElement that has no windowHandle
+		# and does not connect through parents back to the desktop.
+		# #17841: yet messages such as window restored/maximized coming from File Explorer (Windows shell)
+		# should be announced from everywhere (applicable on Windows 11 24H2 and later).
+		# Therefore, ask app modules if notifications (including from these elements) should be processed.
+		try:
+			processId = sender.CachedProcessID
+		except COMError:
+			pass
+		else:
+			appMod = appModuleHandler.getAppModuleFromProcessID(processId)
+			if not appMod.shouldProcessUIANotificationEvent(
+				sender,
+				NotificationKind=NotificationKind,
+				NotificationProcessing=NotificationProcessing,
+				displayString=displayString,
+				activityId=activityId,
+			):
+				if _isDebug():
+					log.debugWarning(
+						"HandleNotificationEvent: dropping notification event "
+						f"at request of appModule {appMod.appName}",
+					)
+				return
+		# Take desktop window handle as a substitute if window handle is not set.
+		if not (window := self.getNearestWindowHandle(sender)):
+			window = api.getDesktopObject().windowHandle
+			if _isDebug():
+				log.debugWarning(
+					"HandleNotificationEvent: native window handle not found, "
+					f"using desktop window handle {window}",
+				)
 		import NVDAObjects.UIA
 
 		try:
-			obj = NVDAObjects.UIA.UIA(UIAElement=sender)
+			obj = NVDAObjects.UIA.UIA(UIAElement=sender, windowHandle=window)
 		except Exception:
 			if _isDebug():
 				log.debugWarning(
@@ -1056,8 +1088,7 @@ def IUIAutomationNotificationEventHandler_HandleNotificationEvent(
 				)
 			return
 		if not obj:
-			# Sometimes notification events can be fired on a UIAElement that has no windowHandle and does not connect through parents back to the desktop.
-			# There is nothing we can do with these.
+			# Sometimes UIA object can be None despite setting window handle to something else.
 			if _isDebug():
 				log.debug(
 					"HandleNotificationEvent: Ignoring because no object: "
diff --git a/source/appModuleHandler.py b/source/appModuleHandler.py
@@ -44,6 +44,7 @@
 from fileUtils import getFileVersionInfo
 import globalVars
 from systemUtils import getCurrentProcessLogonSessionId, getProcessLogonSessionId
+from comInterfaces import UIAutomationClient as UIA
 
 
 # Dictionary of processID:appModule pairs used to hold the currently running modules
@@ -765,6 +766,36 @@ def shouldProcessUIAPropertyChangedEvent(self, sender, propertyId):
 		"""
 		return True
 
+	def shouldProcessUIANotificationEvent(
+		self,
+		sender: UIA.IUIAutomationElement,
+		NotificationKind: int | None = None,
+		NotificationProcessing: int | None = None,
+		displayString: str = "",
+		activityId: str = "",
+	) -> bool:
+		"""
+		Determines whether NVDA should process a UIA notification event.
+
+		By default, events from elements with window handle value set
+		and traversable back to the desktop will be accepted.
+		Returning ``False`` will cause the event to be dropped completely.
+		Returning ``True`` means that the event will be processed, but it might still
+		be rejected later; e.g. because it isn't native UIA, because
+		shouldAcceptEvent returns False, etc.
+
+		:param sender: UIA element raising the notification event.
+		:param NotificationKind: notification kind such as activity completion.
+		:param NotificationProcessing: how NVDA should process notifications such as canceling speech.
+		:param displayString: notification content/text.
+		:param activityId: notification description.
+		:return: Whether NVDA components including ap modules and NVDA objects should process notification events.
+		"""
+		import UIAHandler
+
+		# By default, see if UIA tree can be traversed to arrive at the desktop element.
+		return bool(UIAHandler.handler.getNearestWindowHandle(sender))
+
 	def dumpOnCrash(self):
 		"""Request that this process writes a minidump when it crashes for debugging.
 		This should only be called if instructed by a developer.
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-2023 NV Access Limited, Joseph Lee, Łukasz Golonka, Julien Cochuyt
+# Copyright (C) 2006-2025 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.
 
@@ -26,7 +26,9 @@
 from NVDAObjects.behaviors import ToolTip
 from NVDAObjects.window.edit import RichEdit50, Edit
 import config
+import ui
 from winAPI.types import HWNDValT
+from comInterfaces import UIAutomationClient
 
 
 # Suppress incorrect Win 10 Task switching window focus
@@ -560,3 +562,37 @@ def event_UIA_elementSelected(self, obj: NVDAObject, nextHandler: Callable[[], N
 				),
 			)
 		nextHandler()
+
+	def shouldProcessUIANotificationEvent(
+		self,
+		sender: UIAutomationClient.IUIAutomationElement,
+		NotificationKind: int | None = None,
+		NotificationProcessing: int | None = None,
+		displayString: str = "",
+		activityId: str = "",
+	) -> bool:
+		if activityId == "Windows.Shell.SnapComponent.SnapHotKeyResults":
+			return True
+		return super().shouldProcessUIANotificationEvent(
+			sender,
+			NotificationKind=NotificationKind,
+			NotificationProcessing=NotificationProcessing,
+			displayString=displayString,
+			activityId=activityId,
+		)
+
+	def event_UIA_notification(
+		self,
+		obj: NVDAObject,
+		nextHandler: Callable[[], None],
+		NotificationKind: int | None = None,
+		NotificationProcessing: int | None = None,
+		displayString: str = "",
+		activityId: str = "",
+	) -> None:
+		# #17841: announce window states across apps (Windows 11 24H2 and later).
+		# These messages come from a File Explorer (shell) element and there is no native window handle.
+		if activityId == "Windows.Shell.SnapComponent.SnapHotKeyResults":
+			ui.message(displayString)
+			return
+		nextHandler()
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -7,6 +7,7 @@
 ### New Features
 
 * In Microsoft Word, the new view is now reported when using the shortcuts to switch to page view (`control+alt+p`) or outline view (`control+alt+o`). (#18091, @CyrilleB79)
+* In Windows 11 2024 Update and Server 2025 and later, NVDA will announce foreground window states such as restore, maximize, and snap when changing window position by pressing `windows+arrow` keys. (#17841, #18175, @josephsl)
 * Unassigned commands have been added to open the NVDA settings dialog in the following categories: Vision, Windows OCR, Add-on Store and Advanced. (#18313, @CyrilleB79)
 
 ### Changes
