Merge 225aef7 into 0a6806a

josephsl · web-flow · commit 5033c9e9ac53 · 2021-05-18T19:36:08.000+10:00
diff --git a/source/NVDAObjects/UIA/__init__.py b/source/NVDAObjects/UIA/__init__.py
@@ -1,7 +1,7 @@
 # A part of NonVisual Desktop Access (NVDA)
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
-# Copyright (C) 2009-2020 NV Access Limited, Joseph Lee, Mohammad Suliman,
+# Copyright (C) 2009-2021 NV Access Limited, Joseph Lee, Mohammad Suliman,
 # Babbage B.V., Leonard de Ruijter, Bill Dengler
 
 """Support for UI Automation (UIA) controls."""
@@ -1832,6 +1832,24 @@ def event_UIA_notification(self, notificationKind=None, notificationProcessing=U
 				speech.cancelSpeech()
 			ui.message(displayString)
 
+	def event_UIA_dragComplete(self):
+		"""
+		Raised by an element when a drag operation on it is completed.
+		A prominent example is rearranging Start screen tiles on Windows 8 and later.
+		"""
+		# #12271: speech does not report new location but braille does.
+		self.reportFocus()
+
+	def event_UIA_droptTargetDropped(self):
+		"""
+		Raised by a containing element such as a list when an element is dragged over another element.
+		A prominent example is rearranging quick actions in Windows 10 Action Center.
+		"""
+		# #12271: unlike drag complete event, it is a different element that raises this event.
+		# but NVDA does record the newly dragged element as focused object.
+		api.getFocusObject().reportFocus()
+
+
 class TreeviewItem(UIA):
 
 	def _get_value(self):
diff --git a/source/_UIAHandler.py b/source/_UIAHandler.py
@@ -189,6 +189,8 @@
 	#UIA_ToolTipClosedEventId:"hide",
 	UIA_Window_WindowOpenedEventId:"UIA_window_windowOpen",
 	UIA_SystemAlertEventId:"UIA_systemAlert",
+	UIA_Drag_DragCompleteEventId: "UIA_dragComplete",
+	UIA_DropTarget_DroppedEventId: "UIA_droptTargetDropped",
 }
 
 localEventHandlerGroupUIAEventIds = set()

Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,8 @@`
`189`	`189`	`#UIA_ToolTipClosedEventId:"hide",`
`190`	`190`	`UIA_Window_WindowOpenedEventId:"UIA_window_windowOpen",`
`191`	`191`	`UIA_SystemAlertEventId:"UIA_systemAlert",`
	`192`	`+ UIA_Drag_DragCompleteEventId: "UIA_dragComplete",`
	`193`	`+ UIA_DropTarget_DroppedEventId: "UIA_droptTargetDropped",`
`192`	`194`	`}`
`193`	`195`
`194`	`196`	`localEventHandlerGroupUIAEventIds = set()`