When closing a modern Microsoft input method candidate list, focus is…

… correctly restored to either the input composition or the underlying document. Fixes #4145.
nvaccess · Jan 6, 2016 · 7b65a13 · 7b65a13
1 parent 796f3f1
commit 7b65a13
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/source/IAccessibleHandler.py b/source/IAccessibleHandler.py
@@ -779,7 +779,7 @@ def processDestroyWinEvent(window,objectID,childID):
 	focus=api.getFocusObject()
 	from NVDAObjects.IAccessible.mscandui import BaseCandidateItem
 	if objectID==0 and childID==0 and isinstance(focus,BaseCandidateItem) and window==focus.windowHandle and not eventHandler.isPendingEvents("gainFocus"):
-		obj=focus.parent
+		obj=focus.container
 		if obj:
 			eventHandler.queueEvent("gainFocus",obj)
 

diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -37,6 +37,7 @@
 - When a toggle button is focused, NVDA now reports when it is changed from pressed to not pressed. (#5441)
 - Reporting of mouse shape changes again works as expected. (#5595)
 - When speaking line indentation, non-breaking spaces are now treated as normal spaces. Previously, this could cause announcements such as "space space space" instead  of "3 space". (#5610)
+- When closing a modern Microsoft input method candidate list, focus is correctly restored to either the input composition or the underlying document. (#4145)
 
 
 == Changes for Developers ==