Merge 35ee022 into 99a9ea8

josephsl · web-flow · commit a0b2fff61fb9 · 2023-02-10T14:35:19.000+10:00
diff --git a/source/appModules/notepad.py b/source/appModules/notepad.py
@@ -1,19 +1,23 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2022 NV Access Limited, Joseph Lee
+# Copyright (C) 2022-2023 NV Access Limited, Joseph Lee
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
 """App module for Windows Notepad.
 While this app module also covers older Notepad releases,
 this module provides workarounds for Windows 11 Notepad."""
 
+from comtypes import COMError
 import appModuleHandler
 import api
+import UIAHandler
+from NVDAObjects.UIA import UIA
+from NVDAObjects import NVDAObject
 
 
 class AppModule(appModuleHandler.AppModule):
 
-	def _get_statusBar(self):
+	def _get_statusBar(self) -> 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.
 		Windows 11 Notepad uses Windows 11 UI design (top-level window is labeled "DesktopWindowXamlSource",
@@ -32,11 +36,16 @@ def _get_statusBar(self):
 		# Thankfully, of all the UIA objects encountered, document window has a unique window class name.
 		if api.getFocusObject().windowClassName != "RichEditD2DPT":
 			raise NotImplementedError()
-		# Look for a specific child as some children report the same UIA properties such as class name.
-		# Make sure to look for a foreground UIA element which hosts status bar content if visible.
-		notepadStatusBarIndex = 7
-		statusBar = api.getForegroundObject().children[notepadStatusBarIndex].firstChild
-		# No location for a disabled status bar i.e. location is 0 (x, y, width, height).
-		if not any(statusBar.location):
-			raise NotImplementedError()
+		# Obtain status bar text across Notepad 11 releases.
+		clientObject = UIAHandler.handler.clientObject
+		condition = clientObject.createPropertyCondition(UIAHandler.UIA_AutomationIdPropertyId, "ContentTextBlock")
+		walker = clientObject.createTreeWalker(condition)
+		notepadWindow = UIAHandler.handler.clientObject.elementFromHandle(api.getForegroundObject().windowHandle)
+		try:
+			element = walker.getFirstChildElement(notepadWindow)
+			# Is status bar even showing?
+			element = element.buildUpdatedCache(UIAHandler.handler.baseCacheRequest)
+		except (ValueError, COMError):
+			raise NotImplementedError
+		statusBar = UIA(UIAElement=element).parent
 		return statusBar
