Provide a locationHelper module for code related to locations, rectangles and points

source/NVDAObjects/IAccessible/MSHTML.py

@@ -27,6 +27,7 @@
 from .. import InvalidNVDAObject
 from ..window import Window
 from NVDAObjects.UIA import UIA, UIATextInfo
+from locationHelper import RectLTRB
 
 IID_IHTMLElement=comtypes.GUID('{3050F1FF-98B5-11CF-BB82-00AA00BDCE0B}')
 
@@ -586,11 +587,7 @@ def _get_location(self):
 			top=int(r.top*yFactor)
 			right=int(r.right*xFactor)
 			bottom=int(r.bottom*yFactor)
-			width=right-left
-			height=bottom-top
-			p=ctypes.wintypes.POINT(x=left,y=top)
-			ctypes.windll.user32.ClientToScreen(self.windowHandle,ctypes.byref(p))
-			return (p.x,p.y,width,height)
+			return RectLTRB(left,top,right,bottom).toScreen(self.windowHandle).toLTWH()
 		return None
 
 	def _get_TextInfo(self):

source/NVDAObjects/IAccessible/__init__.py

@@ -31,6 +31,7 @@
 import NVDAObjects.JAB
 import eventHandler
 from NVDAObjects.behaviors import ProgressBar, Dialog, EditableTextWithAutoSelectDetection, FocusableUnfocusableContainer, ToolTip, Notification
+from locationHelper import RectLTWH
 
 def getNVDAObjectFromEvent(hwnd,objectID,childID):
 	try:
@@ -890,7 +891,7 @@ def _get_childCount(self):
 
 	def _get_location(self):
 		try:
-			return self.IAccessibleObject.accLocation(self.IAccessibleChildID)
+			return RectLTWH(*self.IAccessibleObject.accLocation(self.IAccessibleChildID))
 		except COMError:
 			return None
 

source/NVDAObjects/IAccessible/sysListView32.py

@@ -23,6 +23,7 @@
 import watchdog
 from NVDAObjects.behaviors import RowWithoutCellObjects, RowWithFakeNavigation
 import config
+from locationHelper import toRectLTWH
 
 #Window messages
 LVM_FIRST=0x1000
@@ -307,7 +308,7 @@ def _getColumnLocationRaw(self,index):
 			winKernel.virtualFreeEx(processHandle,internalRect,0,winKernel.MEM_RELEASE)
 		windll.user32.ClientToScreen(self.windowHandle,byref(localRect))
 		windll.user32.ClientToScreen(self.windowHandle,byref(localRect,8))
-		return (localRect.left,localRect.top,localRect.right-localRect.left,localRect.bottom-localRect.top)
+		return toRectLTWH(localRect)
 
 	def _getColumnLocation(self,column):
 		return self._getColumnLocationRaw(self.parent._columnOrderArray[column - 1])

source/NVDAObjects/JAB/__init__.py

@@ -9,6 +9,7 @@
 import textInfos.offsets
 from logHandler import log
 from .. import InvalidNVDAObject
+from locationHelper import RectLTWH
 
 JABRolesToNVDARoles={
 	"alert":controlTypes.ROLE_DIALOG,
@@ -301,7 +302,7 @@ def _get_description(self):
 		return re_simpleXmlTag.sub(" ", self._JABAccContextInfo.description)
 
 	def _get_location(self):
-		return (self._JABAccContextInfo.x,self._JABAccContextInfo.y,self._JABAccContextInfo.width,self._JABAccContextInfo.height)
+		return RectLTWH(self._JABAccContextInfo.x,self._JABAccContextInfo.y,self._JABAccContextInfo.width,self._JABAccContextInfo.height)
 
 	def _get_hasFocus(self):
 		if controlTypes.STATE_FOCUSED in self.states:

source/NVDAObjects/UIA/__init__.py

@@ -31,6 +31,7 @@
 from NVDAObjects.behaviors import ProgressBar, EditableTextWithoutAutoSelectDetection, Dialog, Notification, EditableTextWithSuggestions
 import braille
 import time
+from locationHelper import RectLTWH
 
 class UIATextInfo(textInfos.TextInfo):
 
@@ -1225,7 +1226,7 @@ def _get_location(self):
 		top=int(r[1])
 		width=int(r[2])
 		height=int(r[3])
-		return left,top,width,height
+		return RectLTWH(left,top,width,height)
 
 	def _get_value(self):
 		val=self._getUIACacheablePropertyValue(UIAHandler.UIA_RangeValueValuePropertyId,True)

source/NVDAObjects/window/__init__.py

@@ -17,6 +17,7 @@
 from NVDAObjects import NVDAObject
 from NVDAObjects.behaviors import EditableText, LiveText
 import watchdog
+from locationHelper import toRectLTWH
 
 re_WindowsForms=re.compile(r'^WindowsForms[0-9]*\.(.*)\.app\..*$')
 re_ATL=re.compile(r'^ATL:(.*)$')
@@ -189,7 +190,7 @@ def _get_windowControlID(self):
 	def _get_location(self):
 		r=ctypes.wintypes.RECT()
 		ctypes.windll.user32.GetWindowRect(self.windowHandle,ctypes.byref(r))
-		return (r.left,r.top,r.right-r.left,r.bottom-r.top)
+		return toRectLTWH(r)
 
 	def _get_displayText(self):
 		"""The text at this object's location according to the display model for this object's window."""

source/appModules/powerpnt.py

@@ -33,6 +33,7 @@
 import controlTypes
 from logHandler import log
 import scriptHandler
+from locationHelper import RectLTRB
 from NVDAObjects.window._msOfficeChart import OfficeChart
 
 # Window classes where PowerPoint's object model should be used 
@@ -738,9 +739,7 @@ def _get_location(self):
 		top=self.documentWindow.ppObjectModel.pointsToScreenPixelsY(pointTop)
 		right=self.documentWindow.ppObjectModel.pointsToScreenPixelsX(pointLeft+pointWidth)
 		bottom=self.documentWindow.ppObjectModel.pointsToScreenPixelsY(pointTop+pointHeight)
-		width=right-left
-		height=bottom-top
-		return (left,top,width,height)
+		return RectLTRB(left,top,right,bottom).toLTWH()
 
 	def _get_ppShapeType(self):
 		"""Fetches and caches the type of this shape."""

source/displayModel.py

@@ -19,6 +19,7 @@
 import watchdog
 from logHandler import log
 import windowUtils
+from locationHelper import RectLTRB
 
 def wcharToInt(c):
 	i=ord(c)
@@ -178,7 +179,7 @@ def getWindowTextInRect(bindingHandle, windowHandle, left, top, right, bottom,mi
 	characterLocations = []
 	cpBufIt = iter(cpBuf)
 	for cp in cpBufIt:
-		characterLocations.append((wcharToInt(cp), wcharToInt(next(cpBufIt)), wcharToInt(next(cpBufIt)), wcharToInt(next(cpBufIt))))
+		characterLocations.append(RectLTRB(wcharToInt(cp), wcharToInt(next(cpBufIt)), wcharToInt(next(cpBufIt)), wcharToInt(next(cpBufIt))))
 	return text, characterLocations
 
 def getFocusRect(obj):