From 10a080ab9964cea58fed5c642f52c6d917a9f7bb Mon Sep 17 00:00:00 2001
From: Nolan Darilek <nolan@thewordnerd.info>
Date: Tue, 9 Jun 2020 13:27:53 -0500
Subject: [PATCH] Speak expanded/collapsed state of `TreeItem` immediately
 after its name.

---
 Accessible.gd | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Accessible.gd b/Accessible.gd
index c4243c9..5d9c004 100644
--- a/Accessible.gd
+++ b/Accessible.gd
@@ -349,6 +349,11 @@ func _tree_item_render():
 			var column_text = cell.get_text(i)
 			if column_text:
 				tokens.append(column_text)
+			if cell.get_children():
+				if cell.collapsed:
+					tokens.append("collapsed")
+				else:
+					tokens.append("expanded")
 			var button_count = cell.get_button_count(i)
 			if button_count != 0:
 				button_index = 0
@@ -365,11 +370,6 @@ func _tree_item_render():
 					tokens.append("button")
 				if button_count > 1:
 					tokens.append("Use Home and End to switch focus.")
-	if cell.get_children():
-		if cell.collapsed:
-			tokens.append("collapsed")
-		else:
-			tokens.append("expanded")
 	tokens.append("tree item")
 	if tokens != _last_tree_item_tokens:
 		TTS.speak(tokens.join(": "), true)