Merge bb74657 into 2392d13

josephsl · web-flow · commit 7a8a4c483678 · 2022-09-02T12:07:15.000+10:00
diff --git a/source/NVDAObjects/UIA/__init__.py b/source/NVDAObjects/UIA/__init__.py
@@ -1589,6 +1589,7 @@ def _get_keyboardShortcut(self):
 		UIAHandler.UIA_IsEnabledPropertyId,
 		UIAHandler.UIA_IsOffscreenPropertyId,
 		UIAHandler.UIA_AnnotationTypesPropertyId,
+		UIAHandler.UIA_DragIsGrabbedPropertyId,
 	}
 
 	def _get_states(self):
@@ -1667,6 +1668,13 @@ def _get_states(self):
 		if annotationTypes:
 			if UIAHandler.AnnotationType_Comment in annotationTypes:
 				states.add(controlTypes.State.HASCOMMENT)
+		# Drag "is grabbed" property was added in Windows 8.
+		try:
+			isGrabbed = self._getUIACacheablePropertyValue(UIAHandler.UIA_DragIsGrabbedPropertyId)
+		except COMError:
+			isGrabbed = False
+		if isGrabbed:
+			states.add(controlTypes.State.DRAGGING)
 		return states
 
 	def _getReadOnlyState(self) -> bool:
diff --git a/source/UIAHandler/__init__.py b/source/UIAHandler/__init__.py
@@ -209,6 +209,7 @@
 	UIA.UIA_Window_WindowOpenedEventId: "UIA_window_windowOpen",
 	UIA.UIA_SystemAlertEventId: "UIA_systemAlert",
 	UIA.UIA_LayoutInvalidatedEventId: "UIA_layoutInvalidated",
+	UIA.UIA_Drag_DragStartEventId: "stateChange",
 }
 
 localEventHandlerGroupUIAEventIds = set()
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -57,6 +57,7 @@ Note there are still known issues with Chrome and Edge. (#13254)
   -
 - NVDA will announce UIA item status property changes in places such as the Visual Studio 2022 create app packages dialog. (#13973)
 - Orientation state (landscape/portrait) changes are now correctly ignored when there is no change (e.g. monitor changes). (#14035)
+- NVDA will announce dragging state when a UI Automation control is about to be dragged via mouse or keyboard, notably when rearranging tiles in Windows 10 start menu. (#14081)
 -
 
 

Original file line number	Diff line number	Diff line change
`@@ -209,6 +209,7 @@`
`209`	`209`	`UIA.UIA_Window_WindowOpenedEventId: "UIA_window_windowOpen",`
`210`	`210`	`UIA.UIA_SystemAlertEventId: "UIA_systemAlert",`
`211`	`211`	`UIA.UIA_LayoutInvalidatedEventId: "UIA_layoutInvalidated",`
	`212`	`+ UIA.UIA_Drag_DragStartEventId: "stateChange",`
`212`	`213`	`}`
`213`	`214`
`214`	`215`	`localEventHandlerGroupUIAEventIds = set()`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ Note there are still known issues with Chrome and Edge. (#13254)`
`57`	`57`	`-`
`58`	`58`	`- NVDA will announce UIA item status property changes in places such as the Visual Studio 2022 create app packages dialog. (#13973)`
`59`	`59`	`- Orientation state (landscape/portrait) changes are now correctly ignored when there is no change (e.g. monitor changes). (#14035)`
	`60`	`+- NVDA will announce dragging state when a UI Automation control is about to be dragged via mouse or keyboard, notably when rearranging tiles in Windows 10 start menu. (#14081)`
`60`	`61`	`-`
`61`	`62`
`62`	`63`