From 421dcbcf42c901d86d571ca2849d466e61354e6b Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Mon, 9 Sep 2019 14:44:10 -0500 Subject: [PATCH] Check node tree ancestry, rather than superclass ancestry, to associate an `EditorProperty` with its label. --- addons/accessibility/accessible.gd | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/addons/accessibility/accessible.gd b/addons/accessibility/accessible.gd index fc70693..ab101d3 100644 --- a/addons/accessibility/accessible.gd +++ b/addons/accessibility/accessible.gd @@ -30,6 +30,13 @@ func left_click(item := node): click.pressed = false node.get_tree().input_event(click) +func guess_label(): + var parent = node.get_parent() + while parent: + if parent is EditorProperty and parent.label: + return parent.label + parent = parent.get_parent() + func close_key_event_dialog(): node.get_ok().emit_signal("pressed") @@ -310,9 +317,9 @@ func tab_container_input(event): func focused(): print("Focus: %s" % node) tts.stop() - var parent = node.get_parent() - if parent is EditorProperty and parent.label: - tts.speak(parent.label, false) + var label = guess_label() + if label: + tts.speak(label, false) if node is MenuButton: menu_button_focus() elif node is AcceptDialog: