Merge 9b121c8 into 8dcddfd

michaelDCurran · web-flow · commit 3fbcb02018b6 · 2021-09-06T09:08:12.000+10:00
diff --git a/source/NVDAObjects/IAccessible/__init__.py b/source/NVDAObjects/IAccessible/__init__.py
@@ -122,6 +122,12 @@ class IA2TextTextInfo(textInfos.offsets.OffsetsTextInfo):
 
 	detectFormattingAfterCursorMaybeSlow=False
 
+	def scrollIntoView(self):
+		self.obj.IAccessibleTextObject.scrollSubstringTo(
+			self._startOffset, self._endOffset,
+			IA2.IA2_SCROLL_TYPE_TOP_LEFT
+		)
+
 	def _get_encoding(self):
 		return super().encoding
 
diff --git a/source/NVDAObjects/UIA/__init__.py b/source/NVDAObjects/UIA/__init__.py
@@ -45,6 +45,9 @@
 
 class UIATextInfo(textInfos.TextInfo):
 
+	def scrollIntoView(self):
+		self._rangeObj.scrollIntoView(True)
+
 	_cache_controlFieldNVDAObjectClass=True
 	def _get_controlFieldNVDAObjectClass(self):
 		"""
diff --git a/source/NVDAObjects/window/winword.py b/source/NVDAObjects/window/winword.py
@@ -888,6 +888,12 @@ def _normalizeFormatField(self,field,extraDetail=False):
 			field['line-prefix']=mapPUAToUnicode.get(bullet,bullet)
 		return field
 
+	def scrollIntoView(self):
+		try:
+			self.obj.WinwordWindowObject.ScrollIntoView(self._rangeObj, True)
+		except COMError:
+			log.debugWarning("Can't scroll", exc_info=True)
+
 	def expand(self,unit):
 		if unit==textInfos.UNIT_LINE: 
 			try:
diff --git a/source/browseMode.py b/source/browseMode.py
@@ -1237,6 +1237,7 @@ def _get_focusableNVDAObjectAtStart(self):
 			return self.obj.rootNVDAObject
 		return item.obj
 
+
 class BrowseModeDocumentTreeInterceptor(documentBase.DocumentWithTableNavigation,cursorManager.CursorManager,BrowseModeTreeInterceptor,treeInterceptorHandler.DocumentTreeInterceptor):
 
 	programmaticScrollMayFireEvent = False
@@ -1354,13 +1355,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()
+			info.scrollIntoView()
 			if self.programmaticScrollMayFireEvent:
 				self._lastProgrammaticScrollTime = time.time()
 		if focusObj:
diff --git a/source/textInfos/__init__.py b/source/textInfos/__init__.py
@@ -640,6 +640,13 @@ def getMathMl(self, field):
 		"""
 		raise NotImplementedError
 
+	def scrollIntoView(self):
+		"""
+		Scrolls the window to ensure that this text range is visible.
+		"""
+		raise NotImplementedError
+
+
 RE_EOL = re.compile("\r\n|[\n\r]")
 def convertToCrlf(text):
 	"""Convert a string so that it contains only CRLF line endings.
diff --git a/source/treeInterceptorHandler.py b/source/treeInterceptorHandler.py
@@ -186,6 +186,9 @@ def _get__rangeObj(self):
 	def _set__rangeObj(self,r):
 		self.innerTextInfo._rangeObj=r
 
+	def scrollIntoView(self):
+		self.innerTextInfo.scrollIntoView()
+
 	def _get_locationText(self):
 		return self.innerTextInfo.locationText
 
diff --git a/source/virtualBuffers/__init__.py b/source/virtualBuffers/__init__.py
@@ -394,6 +394,17 @@ def getMathMl(self, field):
 		obj = self.obj.getNVDAObjectFromIdentifier(docHandle, nodeId)
 		return obj.mathMl
 
+	def scrollIntoView(self):
+		# Scroll the deepest object at this point into view.
+		obj = self.NVDAObjectAtStart
+		if not obj:
+			return
+		if obj == self.obj.rootNVDAObject:
+			# However never scroll to the  document itself
+			return
+		obj.scrollIntoView()
+
+
 class VirtualBuffer(browseMode.BrowseModeDocumentTreeInterceptor):
 
 	TextInfo=VirtualBufferTextInfo
