Merge c15c1bf into 4a8593d

michaelDCurran · web-flow · commit 223e0f7957f8 · 2021-09-10T09:12:36.000+10:00
diff --git a/source/NVDAObjects/UIA/wordDocument.py b/source/NVDAObjects/UIA/wordDocument.py
@@ -329,6 +329,9 @@ def getTextWithFields(self,formatConfig=None):
 
 class WordBrowseModeDocument(UIABrowseModeDocument):
 
+	def scrollToPosition(self, info: UIATextInfo):
+		info._rangeObj.scrollIntoView(True)
+
 	def shouldSetFocusToObj(self,obj):
 		# Ignore strange editable text fields surrounding most inner fields (links, table cells etc) 
 		if obj.role==controlTypes.Role.EDITABLETEXT and obj.UIAElement.cachedAutomationID.startswith('UIA_AutomationId_Word_Content'):
diff --git a/source/browseMode.py b/source/browseMode.py
@@ -1336,6 +1336,20 @@ def _activatePosition(self, obj=None, info=None):
 				return
 		super(BrowseModeDocumentTreeInterceptor,self)._activatePosition(obj=obj)
 
+	def scrollToPosition(self, info: textInfos.TextInfo):
+		"""
+		Ensures the document is scrolled such that the given textInfo is visible on screen.
+		"""
+		obj=info.NVDAObjectAtStart
+		if not obj:
+			log.debugWarning("Invalid NVDAObjectAtStart")
+			return
+		if obj==self.rootNVDAObject:
+			return
+		obj.scrollIntoView()
+		if self.programmaticScrollMayFireEvent:
+			self._lastProgrammaticScrollTime = time.time()
+
 	def _set_selection(self, info, reason=OutputReason.CARET):
 		super(BrowseModeDocumentTreeInterceptor, self)._set_selection(info)
 		if isScriptWaiting() or not info.isCollapsed:
@@ -1355,15 +1369,7 @@ def _set_selection(self, info, reason=OutputReason.CARET):
 		else:
 			self._lastCaretMoveWasFocus = False
 			focusObj=info.focusableNVDAObjectAtStart
-			obj=info.NVDAObjectAtStart
-			if not obj:
-				log.debugWarning("Invalid NVDAObjectAtStart")
-				return
-			if obj==self.rootNVDAObject:
-				return
-			obj.scrollIntoView()
-			if self.programmaticScrollMayFireEvent:
-				self._lastProgrammaticScrollTime = time.time()
+			self.scrollToPosition(info)
 		if focusObj:
 			self.passThrough = self.shouldPassThrough(focusObj, reason=reason)
 			if (
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -40,6 +40,7 @@ If you need this functionality please assign a gesture to the appropriate script
  -
 - If a disabled addon is uninstalled and then re-installed it is re-enabled. (#12792)
 - Fixed bugs around updating and removing addons where the addon folder has been renamed or has files opened. (#12792, #12629)
+- Reading / navigating with browse mode in Microsoft Word via UI automation now ensures the document is always scrolled so that current browse mode position is visible, and that the caret position in focus mode correctly reflects the browse mode position. (#9611)
 -
 
 

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ If you need this functionality please assign a gesture to the appropriate script`
`40`	`40`	`-`
`41`	`41`	`- If a disabled addon is uninstalled and then re-installed it is re-enabled. (#12792)`
`42`	`42`	`- Fixed bugs around updating and removing addons where the addon folder has been renamed or has files opened. (#12792, #12629)`
	`43`	`+- Reading / navigating with browse mode in Microsoft Word via UI automation now ensures the document is always scrolled so that current browse mode position is visible, and that the caret position in focus mode correctly reflects the browse mode position. (#9611)`
`43`	`44`	`-`
`44`	`45`
`45`	`46`