Merge 37b63c0 into 2c33c27

mzanm · web-flow · commit 3789121c8b2f · 2023-02-10T08:15:02.000+10:00
diff --git a/source/appModules/notepad.py b/source/appModules/notepad.py
@@ -10,11 +10,27 @@
 from typing import Optional
 import appModuleHandler
 import api
+import braille
+import controlTypes
+import eventHandler
+import speech
 import NVDAObjects
 
 
 class AppModule(appModuleHandler.AppModule):
 
+	def event_UIA_elementSelected(self, obj, nextHandler):
+		# Announce currently selected tab when it changes.
+		if (
+			obj.role == controlTypes.Role.TAB
+			# this is done because 2 selection events are sent for the same object, so to prevent double speaking.
+			and not eventHandler.isPendingEvents("UIA_elementSelected") and controlTypes.State.SELECTED in obj.states):
+			speech.cancelSpeech()
+			speech.speakObject(obj, reason=controlTypes.OutputReason.FOCUS)
+			braille.handler.message(braille.getPropertiesBraille(
+				name=obj.name, role=obj.role, states=obj.states, positionInfo=obj.positionInfo))
+		nextHandler()
+
 	def _get_statusBar(self) -> Optional[NVDAObjects.NVDAObject]:
 		"""Retrieves Windows 11 Notepad status bar.
 		In Windows 10 and earlier, status bar can be obtained by looking at the bottom of the screen.
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -79,6 +79,7 @@ For example, when text has a comment and a footnote associated with it. (#14507,
 - Bug fixed when navigating to the first and last column in a table in Firefox (#14554)
 - When NVDA is launched with --lang=Windows parameter, it is again possible to open NVDA's General settings dialog. (#14407)
 - In newer releases of Windows 11 Notepad, NVDA can once again announce status bar contents. (#14573)
+- In newer releases of Windows 11 Notepad, switching between tabs will announce tab name and position. (#14588)
 -
 
 

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ For example, when text has a comment and a footnote associated with it. (#14507,`
`79`	`79`	`- Bug fixed when navigating to the first and last column in a table in Firefox (#14554)`
`80`	`80`	`- When NVDA is launched with --lang=Windows parameter, it is again possible to open NVDA's General settings dialog. (#14407)`
`81`	`81`	`- In newer releases of Windows 11 Notepad, NVDA can once again announce status bar contents. (#14573)`
	`82`	`+- In newer releases of Windows 11 Notepad, switching between tabs will announce tab name and position. (#14588)`
`82`	`83`	`-`
`83`	`84`
`84`	`85`