Merge 924db88 into 49045d2

josephsl · web-flow · commit c20476fd600d · 2024-05-13T09:45:16.000-06:00
diff --git a/source/appModules/windowsinternal_composableshell_experiences_textinput_inputapp.py b/source/appModules/windowsinternal_composableshell_experiences_textinput_inputapp.py
@@ -51,6 +51,15 @@ def event_show(self):
 			eventHandler.queueEvent("UIA_elementSelected", candidateItem)
 
 
+	def event_focusEntered(self):
+		# #14023: announce visible IME candidates.
+		if (
+			self.parent.UIAAutomationId == "IME_Candidate_Window"
+			and config.conf["inputComposition"]["autoReportAllCandidates"]
+		):
+			ui.message(self.firstChild.visibleCandidateItemsText)
+
+
 class ImeCandidateItem(CandidateItemBehavior, UIA):
 	"""
 	A UIAutomation-based IME candidate Item (such as for  the modern Chinese Microsoft Quick input).
@@ -93,14 +102,6 @@ def _get_basicText(self):
 		return super(ImeCandidateItem, self).name
 
 	def event_UIA_elementSelected(self):
-		# In Windows 11, focus event is fired when a candidate item receives focus,
-		# therefore ignore this event for now.
-		# #16283: do handle hardware keyboard input suggestions.
-		if (
-			winVersion.getWinVer() >= winVersion.WIN11
-			and isinstance(api.getFocusObject().parent, ImeCandidateUI)
-		):
-			return
 		oldNav = api.getNavigatorObject()
 		if isinstance(oldNav, ImeCandidateItem) and self.name == oldNav.name:
 			# Duplicate selection event fired on the candidate item. Ignore it.
@@ -116,6 +117,14 @@ def event_UIA_elementSelected(self):
 				self.appModule._lastImeCandidateVisibleText = newText
 				# speak the new page
 				ui.message(newText)
+		# In Windows 11, focus event is fired when a candidate item receives focus,
+		# therefore ignore this event for now.
+		# #16283: do handle hardware keyboard input suggestions.
+		if (
+			winVersion.getWinVer() >= winVersion.WIN11
+			and isinstance(api.getFocusObject().parent, ImeCandidateUI)
+		):
+			return
 		# Now just report the currently selected candidate item.
 		self.reportFocus()
 
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -24,7 +24,9 @@
 * Improved reliability of automatic text readout, particularly in terminal applications. (#15850, #16027, @Danstiv)
 * Braille cursor routing is now much more reliable when a line contains one or more Unicode variation selectors or decomposed characters. (#10960, #16477, @mltony, @LeonarddeR)
 * NVDA will correctly announce selection changes when editing a cell's text in Microsoft Excel. (#15843)
-* In Windows 11 emoji panel, NVDA will no longer appear to get stuck when closing clipboard history. (#16347, @josephsl)
+* Windows 11 fixes:
+  * In emoji panel, NVDA will no longer appear to get stuck when closing clipboard history. (#16347, @josephsl)
+  * NVDA will once again announce visible candidates when opening Windows 11 IME interface. (#14023, @josephsl)
 
 ### Changes for Developers
 
