Merge 03657dc into 239668a

LeonarddeR · web-flow · commit 30e005b84bf2 · 2023-07-13T15:14:09.000+10:00
diff --git a/source/NVDAObjects/window/excel.py b/source/NVDAObjects/window/excel.py
@@ -460,7 +460,9 @@ class ExcelBrowseModeTreeInterceptor(browseMode.BrowseModeTreeInterceptor):
 
 	def __init__(self,rootNVDAObject):
 		super(ExcelBrowseModeTreeInterceptor,self).__init__(rootNVDAObject)
-		self.passThrough=True
+		# Note, as _set_passThrough has logic to handle braille and vision updates which are unnecessary when
+		# initializing this tree interceptor, we set the private _passThrough variable here, which is enough.
+		self._passThrough = True
 		browseMode.reportPassThrough.last=True
 
 	def _get_currentNVDAObject(self):
diff --git a/source/appModules/excel.py b/source/appModules/excel.py
@@ -39,11 +39,9 @@ def _get_focusRedirect(self):
 				e=UIAHandler.handler.lastFocusedUIAElement
 				if e and e.cachedAutomationID=="CellEdit":
 					obj=UIA(UIAElement=e)
-					oldFocus=api.getFocusObject()
-					if isinstance(oldFocus,ExcelCell):
-						# Set the edit control's parent as the cell that previously had focus. I.e. the cell being edited.
-						# otherwise a whole bunch of UIA focus ancestors for the edit control will be reported.
-						obj.parent=oldFocus
+					# Set the UIA edit control's parent to the parent of self.
+					# otherwise a whole bunch of UIA focus ancestors for the edit control will be reported.
+					obj.parent = self.parent
 					# Cache this for as long as this object exists.
 					self.focusRedirect=obj
 					return obj
diff --git a/source/virtualBuffers/MSHTML.py b/source/virtualBuffers/MSHTML.py
@@ -206,7 +206,11 @@ def __init__(self,rootNVDAObject):
 		# Force focus mode for applications, and dialogs with no parent treeInterceptor (E.g. a dialog embedded in an application)  
 		if rootNVDAObject.role==controlTypes.Role.APPLICATION or (rootNVDAObject.role==controlTypes.Role.DIALOG and (not rootNVDAObject.parent or not rootNVDAObject.parent.treeInterceptor or rootNVDAObject.parent.treeInterceptor.passThrough)):
 			self.disableAutoPassThrough=True
-			self.passThrough=True
+			# Note, as _set_passThrough has logic to handle braille and vision updates which are unnecessary when
+			# initializing this tree interceptor, we set the private _passThrough variable here, which is enough.
+			self._passThrough = True
+			import browseMode
+			browseMode.reportPassThrough.last = True
 
 	def _getInitialCaretPos(self):
 		initialPos = super(MSHTML,self)._getInitialCaretPos()
