@@ -81,8 +81,6 @@ def _get_controlFieldNVDAObjectClass(self):
8181 UIAHandler .UIA_GridColumnCountPropertyId ,
8282 UIAHandler .UIA_GridItemContainingGridPropertyId ,
8383 UIAHandler .UIA_RangeValueValuePropertyId ,
84- UIAHandler .UIA_RangeValueMinimumPropertyId ,
85- UIAHandler .UIA_RangeValueMaximumPropertyId ,
8684 UIAHandler .UIA_ValueValuePropertyId ,
8785 UIAHandler .UIA_PositionInSetPropertyId ,
8886 UIAHandler .UIA_SizeOfSetPropertyId ,
@@ -1182,6 +1180,14 @@ def _get_UIAGridPattern(self):
11821180 self .UIAGridPattern = self ._getUIAPattern (UIAHandler .UIA_GridPatternId ,UIAHandler .IUIAutomationGridPattern )
11831181 return self .UIAGridPattern
11841182
1183+ def _get_UIARangeValuePattern (self ):
1184+ self .UIARangeValuePattern = self ._getUIAPattern (UIAHandler .UIA_RangeValuePatternId ,UIAHandler .IUIAutomationRangeValuePattern )
1185+ return self .UIARangeValuePattern
1186+
1187+ def _get_UIAValuePattern (self ):
1188+ self .UIAValuePattern = self ._getUIAPattern (UIAHandler .UIA_ValuePatternId ,UIAHandler .IUIAutomationValuePattern )
1189+ return self .UIAValuePattern
1190+
11851191 def _get_UIATogglePattern (self ):
11861192 self .UIATogglePattern = self ._getUIAPattern (UIAHandler .UIA_TogglePatternId ,UIAHandler .IUIAutomationTogglePattern )
11871193 return self .UIATogglePattern
@@ -1712,19 +1718,24 @@ def _get_location(self):
17121718 # r is a tuple of floats representing left, top, width and height.
17131719 return locationHelper .RectLTWH .fromFloatCollection (* r )
17141720
1715- def _get_value (self ):
1716- val = self ._getUIACacheablePropertyValue (UIAHandler .UIA_RangeValueValuePropertyId ,True )
1717- if val != UIAHandler .handler .reservedNotSupportedValue :
1718- minVal = self ._getUIACacheablePropertyValue (UIAHandler .UIA_RangeValueMinimumPropertyId ,False )
1719- maxVal = self ._getUIACacheablePropertyValue (UIAHandler .UIA_RangeValueMaximumPropertyId ,False )
1720- if minVal == maxVal :
1721- # There is no range.
1722- return "0"
1723- val = ((val - minVal )/ (maxVal - minVal ))* 100.0
1724- return "%d" % round (val ,4 )
1725- val = self ._getUIACacheablePropertyValue (UIAHandler .UIA_ValueValuePropertyId ,True )
1726- if val != UIAHandler .handler .reservedNotSupportedValue :
1721+ def _get_UIAValue (self ) -> typing .Optional [str ]:
1722+ val = self ._getUIACacheablePropertyValue (UIAHandler .UIA .UIA_ValueValuePropertyId , True )
1723+ if val != UIAHandler .handler .reservedNotSupportedValue :
17271724 return val
1725+ return None
1726+
1727+ def _get_UIARangeValue (self ) -> typing .Optional [float ]:
1728+ val = self ._getUIACacheablePropertyValue (UIAHandler .UIA .UIA_RangeValueValuePropertyId , True )
1729+ if val != UIAHandler .handler .reservedNotSupportedValue :
1730+ return val
1731+ return None
1732+
1733+ def _get_value (self ) -> typing .Optional [str ]:
1734+ if self .UIAValue is not None :
1735+ return self .UIAValue
1736+ if self .UIARangeValue is not None :
1737+ return f"{ round (self .UIARangeValue )}
1738+ return None
17281739
17291740 def _get_actionCount (self ):
17301741 if self .UIAInvokePattern :
0 commit comments