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

Fixes:

Browse Source 
* It was the mouse warping, not the grabbing of focus, that caused keyboard traversal issues. Now we only mouse-warp prior to simulating a right-click via Menu.
 * Despite what the docs say, `id_focused` seems to pass an index, not an ID. Now popup menu items speak more accurately.
This commit is contained in:
Nolan Darilek 2019-09-21 09:19:00 -05:00
parent 977b3407ea
commit 45c44352ba
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
accessible.gd
View File

@ -174,12 +174,8 @@ func panel_focus():
func popup_menu_focus(): func popup_menu_focus():
tts.speak("menu", false) tts.speak("menu", false)
func popup_menu_item_id_focus(id): func popup_menu_item_id_focus(index):
var tokens = PoolStringArray([]) var tokens = PoolStringArray([])
var index = node.get_item_index(id)
print("id: %s, index: %s" % [id, index])
if index == -1:
index = id
var item = node.get_item_text(index) var item = node.get_item_text(index)
if item: if item:
tokens.append(item) tokens.append(item)
@ -201,7 +197,7 @@ func popup_menu_item_id_focus(id):
var text = shortcut.get_as_text() var text = shortcut.get_as_text()
if text != "None": if text != "None":
tokens.append(text) tokens.append(text)
tokens.append(str(id + 1) + " of " + str(node.get_item_count())) tokens.append(str(index + 1) + " of " + str(node.get_item_count()))
tts.speak(tokens.join(": "), true) tts.speak(tokens.join(": "), true)
func tree_item_render(): func tree_item_render():
@ -355,7 +351,6 @@ func tab_container_input(event):
func focus(): func focus():
print("Focus: %s" % node) print("Focus: %s" % node)
node.get_tree().root.warp_mouse(node.rect_global_position)
tts.stop() tts.stop()
var label = guess_label() var label = guess_label()
if label: if label:
@ -400,12 +395,12 @@ func unfocus():
func click_focus(): func click_focus():
if node.has_focus(): if node.has_focus():
return return
# print("Grabbing focus: %s" % node) print("Grabbing focus: %s" % node)
# node.grab_focus() node.grab_focus()
focus()
func gui_input(event): func gui_input(event):
if event is InputEventKey and event.pressed and not event.echo and event.scancode == KEY_MENU: if event is InputEventKey and event.pressed and not event.echo and event.scancode == KEY_MENU:
node.get_tree().root.warp_mouse(node.rect_global_position)
return click(null, BUTTON_RIGHT) return click(null, BUTTON_RIGHT)
if node is TabContainer: if node is TabContainer:
return tab_container_input(event) return tab_container_input(event)