Merge f78ca00 into f5e5514

michaelDCurran · web-flow · commit 72456dd05c96 · 2021-09-10T07:38:59.000+10:00
diff --git a/source/NVDAObjects/IAccessible/__init__.py b/source/NVDAObjects/IAccessible/__init__.py
@@ -122,12 +122,6 @@ 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,9 +45,6 @@
 
 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,12 +888,6 @@ 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
@@ -1238,7 +1238,6 @@ def _get_focusableNVDAObjectAtStart(self):
 			return self.obj.rootNVDAObject
 		return item.obj
 
-
 class BrowseModeDocumentTreeInterceptor(documentBase.DocumentWithTableNavigation,cursorManager.CursorManager,BrowseModeTreeInterceptor,treeInterceptorHandler.DocumentTreeInterceptor):
 
 	programmaticScrollMayFireEvent = False
@@ -1356,7 +1355,13 @@ def _set_selection(self, info, reason=OutputReason.CARET):
 		else:
 			self._lastCaretMoveWasFocus = False
 			focusObj=info.focusableNVDAObjectAtStart
-			info.scrollIntoView()
+			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()
 		if focusObj:
diff --git a/source/textInfos/__init__.py b/source/textInfos/__init__.py
@@ -640,13 +640,6 @@ 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,9 +186,6 @@ 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,18 +394,6 @@ 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:
-			log.debugWarning("Invalid NVDAObjectAtStart")
-			return
-		if obj == self.obj.rootNVDAObject:
-			# However never scroll to the  document itself
-			return
-		obj.scrollIntoView()
-
-
 class VirtualBuffer(browseMode.BrowseModeDocumentTreeInterceptor):
 
 	TextInfo=VirtualBufferTextInfo
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -40,7 +40,6 @@ 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,7 +40,6 @@ 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)`
`44`	`43`	`-`
`45`	`44`
`46`	`45`