Merge 71dd672 into cb35653

Author: michaelDCurran

source/NVDAObjects/UIA/__init__.py

@@ -2019,11 +2019,13 @@ def doAction(self,index=None):
 		if index==0:
 			if self.UIAInvokePattern:
 				self.UIAInvokePattern.Invoke()
-			elif self.UIATogglePattern:
+				return
+			if self.UIATogglePattern:
 				self.UIATogglePattern.toggle()
-			elif self.UIASelectionItemPattern:
+				return
+			if self.UIASelectionItemPattern:
 				self.UIASelectionItemPattern.select()
-			return
+				return
 		raise NotImplementedError
 
 	def _get_hasFocus(self):

source/UIAHandler/browseMode.py

@@ -500,12 +500,6 @@ def _iterNodesByType(self,nodeType,direction="next",pos=None):
 			return UIAControlQuicknavIterator(nodeType,self,pos,condition,direction)
 		raise NotImplementedError
 
-	def _activateNVDAObject(self,obj):
-		try:
-			obj.doAction()
-		except NotImplementedError:
-			pass
-
 	def _get_isAlive(self):
 		if not winUser.isWindow(self.rootNVDAObject.windowHandle):
 			return False

source/browseMode.py

@@ -19,6 +19,8 @@
 
 import wx
 import core
+import winUser
+import mouseHandler
 from logHandler import log
 import documentBase
 import review
@@ -523,10 +525,27 @@ def _activateNVDAObject(self, obj):
 		@param obj: The object to activate.
 		@type obj: L{NVDAObjects.NVDAObject}
 		"""
-		try:
-			obj.doAction()
-		except NotImplementedError:
-			log.debugWarning("doAction not implemented")
+		while obj and obj != self.rootNVDAObject:
+			try:
+				obj.doAction()
+				break
+			except:
+				log.debugWarning("doAction failed")
+			if obj.hasIrrelevantLocation:
+				# This check covers invisible, off screen and a None location
+				log.debugWarning("No relevant location for object")
+				obj = obj.parent
+				continue
+			location = obj.location
+			if not location.width or not location.height:
+				obj = obj.parent
+				continue
+			log.debugWarning("Clicking with mouse")
+			oldX, oldY = winUser.getCursorPos()
+			winUser.setCursorPos(*location.center)
+			mouseHandler.doPrimaryClick()
+			winUser.setCursorPos(oldX, oldY)
+			break
 
 	def _activatePosition(self, obj=None):
 		if not obj:

source/virtualBuffers/gecko_ia2.py

@@ -15,7 +15,6 @@
 import NVDAObjects.IAccessible.mozilla
 import NVDAObjects.behaviors
 import winUser
-import mouseHandler
 import IAccessibleHandler
 
 import oleacc
@@ -391,29 +390,6 @@ def _activateLongDesc(self,controlField):
 		obj=self.getNVDAObjectFromIdentifier(docHandle,ID)
 		obj.doAction(index)
 
-	def _activateNVDAObject(self, obj):
-		while obj and obj != self.rootNVDAObject:
-			try:
-				obj.doAction()
-				break
-			except:
-				log.debugWarning("doAction failed")
-			if obj.hasIrrelevantLocation:
-				# This check covers invisible, off screen and a None location
-				log.debugWarning("No relevant location for object")
-				obj = obj.parent
-				continue
-			location = obj.location
-			if not location.width or not location.height:
-				obj = obj.parent
-				continue
-			log.debugWarning("Clicking with mouse")
-			oldX, oldY = winUser.getCursorPos()
-			winUser.setCursorPos(*location.center)
-			mouseHandler.doPrimaryClick()
-			winUser.setCursorPos(oldX, oldY)
-			break
-
 	def _searchableTagValues(self, values):
 		return values
 

user_docs/en/changes.t2t

@@ -53,6 +53,7 @@ It is also updated with UIA enabled, when typing text and braille is tethered to
 - When using say all or commands which spell text, pauses between sentences or characters no longer gradually decrease over time. (#15739)
 - NVDA no longer sometimes freezes when speaking a large amount of text. (#15752)
 - More objects which contain useful text are detected, and text content is displayed in braille. (#15605)
+- When accessing Microsoft Edge using UI Automation, NVDA is able to activate more controls in browse mode. (#14612)
 -
 
 == Changes for Developers ==