projects/godot-accessibility
1
0
Fork 0
mirror of https://github.com/lightsoutgames/godot-accessibility.git synced 2024-11-22 11:55:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Label improvements, plus trimming.

Browse Source 
* Labels themselves don't have labels, so `guess_label()` on a `Label` returns null.
* Remove unused `is_in_bar()` function.
* Prepend `_` to more private function names.
This commit is contained in:
Nolan Darilek 2020-06-16 11:54:49 -05:00
parent 3cbcfa8f40
commit 8f110a27d3
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Accessible.gd
View File

@ -28,7 +28,9 @@ func click(item := node, button_index = BUTTON_LEFT):
node.get_tree().input_event(click) node.get_tree().input_event(click)
func guess_label(): func _guess_label():
if node is Label:
return
var tokens = PoolStringArray([]) var tokens = PoolStringArray([])
var to_check = node var to_check = node
while to_check: while to_check:
@ -534,7 +536,7 @@ func focused():
print_debug("Focus: %s" % node) print_debug("Focus: %s" % node)
TTS.stop() TTS.stop()
if not node is Label: if not node is Label:
var label = guess_label() var label = _guess_label()
if label: if label:
if label is Label: if label is Label:
label = label.text label = label.text
@ -619,17 +621,7 @@ func gui_input(event):
return editor_inspector_section_input(event) return editor_inspector_section_input(event)
func is_in_bar(): func _is_focusable(node):
var parent = node.get_parent()
if parent and parent is Container:
for child in parent.get_children():
if child and not is_focusable(child):
return false
return true
return false
func is_focusable(node):
if node.is_class("SceneTreeEditor"): if node.is_class("SceneTreeEditor"):
return false return false
if node.is_class("MultiMeshEditor"): if node.is_class("MultiMeshEditor"):
@ -693,9 +685,9 @@ func _init(node):
add_to_group("accessibles") add_to_group("accessibles")
node.add_child(self) node.add_child(self)
self.node = node self.node = node
if is_focusable(node): if _is_focusable(node):
node.set_focus_mode(Control.FOCUS_ALL) node.set_focus_mode(Control.FOCUS_ALL)
var label = guess_label() var label = _guess_label()
if label and label is Label: if label and label is Label:
label.set_focus_mode(Control.FOCUS_NONE) label.set_focus_mode(Control.FOCUS_NONE)
node.connect("focus_entered", self, "focused") node.connect("focus_entered", self, "focused")