Merge 241bc32 into 99a9ea8

josephsl · web-flow · commit 6ce4716378ee · 2023-02-09T16:19:00.000-08:00
diff --git a/source/appModules/notepad.py b/source/appModules/notepad.py
@@ -1,5 +1,5 @@
 # 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.
 
@@ -9,11 +9,14 @@
 
 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,10 +35,23 @@ 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
+		# Obtain status bar text across Notepad 11 releases.
+		clientObject = UIAHandler.handler.clientObject
+		condition = clientObject.CreatePropertyCondition(UIAHandler.UIA_AutomationIdPropertyId, "ContentTextBlock")
+		uiItemWindow = clientObject.ElementFromHandleBuildCache(
+			api.getForegroundObject().windowHandle, UIAHandler.handler.baseCacheRequest
+		)
+		# Instantiate UIA object directly.
+		# In order for this to work, a valid UIA pointer must be returned.
+		try:
+			statusBarText = UIA(
+				UIAElement=uiItemWindow.FindFirstBuildCache(
+					UIAHandler.TreeScope_Descendants, condition, UIAHandler.handler.baseCacheRequest
+				)
+			)
+		except ValueError:
+			raise NotImplementedError()
+		statusBar = statusBarText.parent
 		# No location for a disabled status bar i.e. location is 0 (x, y, width, height).
 		if not any(statusBar.location):
 			raise NotImplementedError()
