Merge f3d14c9 into 6de241b

mzanm · web-flow · commit cbede09d0e6d · 2022-08-14T13:31:57.000+10:00
diff --git a/source/NVDAObjects/UIA/__init__.py b/source/NVDAObjects/UIA/__init__.py
@@ -1647,6 +1647,11 @@ def _get_states(self):
 		if s!=UIAHandler.handler.reservedNotSupportedValue:
 			if not role:
 				role=self.role
+			if s == UIAHandler.ToggleState_Indeterminate:
+				if role == controlTypes.Role.TOGGLEBUTTON:
+					states.add(controlTypes.State.HALFPRESSED)
+				else:
+					states.add(controlTypes.State.HALFCHECKED)
 			if role==controlTypes.Role.TOGGLEBUTTON:
 				if s==UIAHandler.ToggleState_On:
 					states.add(controlTypes.State.PRESSED)
diff --git a/source/braille.py b/source/braille.py
@@ -202,6 +202,8 @@
 	controlTypes.State.SELECTED: _("sel"),
 	# Displayed in braille when an object (e.g. a toggle button) is pressed.
 	controlTypes.State.PRESSED: u"⢎⣿⡱",
+	# Displayed in braille when an object (e.g. a toggle button) is half pressed.
+	controlTypes.State.HALFPRESSED: u"⢎⣸⡱",
 	# Displayed in braille when an object (e.g. a check box) is checked.
 	controlTypes.State.CHECKED: u"⣏⣿⣹",
 	# Displayed in braille when an object (e.g. a check box) is half checked.
diff --git a/source/controlTypes/deprecatedAliases.py b/source/controlTypes/deprecatedAliases.py
@@ -199,6 +199,7 @@
 STATE_PRESSED = State.PRESSED
 STATE_CHECKED = State.CHECKED
 STATE_HALFCHECKED = State.HALFCHECKED
+STATE_HALFPRESSED = State.HALFPRESSED
 STATE_READONLY = State.READONLY
 STATE_EXPANDED = State.EXPANDED
 STATE_COLLAPSED = State.COLLAPSED
diff --git a/source/controlTypes/processAndLabelStates.py b/source/controlTypes/processAndLabelStates.py
@@ -126,7 +126,7 @@ def _processNegativeStates(
 		and (reason != OutputReason.CHANGE or State.FOCUSED in states)
 	):
 		speakNegatives.add(State.CHECKED)
-	if role == Role.TOGGLEBUTTON:
+	if role == Role.TOGGLEBUTTON and State.HALFPRESSED not in states:
 		speakNegatives.add(State.PRESSED)
 	if reason == OutputReason.CHANGE:
 		# We want to speak this state only if it is changing to negative.
@@ -138,6 +138,9 @@ def _processNegativeStates(
 		# #6946: if HALFCHECKED is present but CHECKED isn't, we should make sure we add CHECKED to speakNegatives.
 		if (State.HALFCHECKED in negativeStates and State.CHECKED not in states):
 			speakNegatives.add(State.CHECKED)
+		if State.HALFPRESSED in negativeStates and State.PRESSED not in states:
+			speakNegatives.add(State.PRESSED)
+
 		if STATES_SORTED & negativeStates and not STATES_SORTED & states:
 			# If the object has just stopped being sorted, just report not sorted.
 			# The user doesn't care how it was sorted before.
diff --git a/source/controlTypes/state.py b/source/controlTypes/state.py
@@ -96,6 +96,7 @@ def negativeDisplayString(self) -> str:
 	# indeterminate progress bar, aka busy indicator. No specific state label.
 	# when combined with role of 'progress bar', role is mutated to 'busy indicator'
 	INDETERMINATE = setBit(44)
+	HALFPRESSED = setBit(45)
 
 
 STATES_SORTED = frozenset([State.SORTED, State.SORTED_ASCENDING, State.SORTED_DESCENDING])
@@ -116,6 +117,8 @@ def negativeDisplayString(self) -> str:
 	State.CHECKED: _("checked"),
 	# Translators: This is presented when a three state check box is half checked.
 	State.HALFCHECKED: _("half checked"),
+	# Translators: This is presented when a three state toggle button is half pressed.
+	State.HALFPRESSED: _("half pressed"),
 	# Translators: This is presented when the control is a read-only control such as read-only edit box.
 	State.READONLY: _("read only"),
 	# Translators: This is presented when a tree view or submenu item is expanded.
