Review focus issues with controller and screen reader

Author: rsubtil

scenes/config/AboutSettings.gd

@@ -29,7 +29,7 @@ func grab_focus():
 	if RetroHubConfig.config.accessibility_screen_reader_enabled:
 		match n_tabs.current_tab:
 			0: # About RetroHub
-				n_logo.grab_focus()
+				n_version.grab_focus()
 			1: # Libraries
 				n_libraries_intro_lbl.grab_focus()
 			2: # Assets
@@ -64,5 +64,5 @@ func _on_OpenIssuesButton_pressed():
 
 func _on_TabContainerHandler_tab_changed(_tab_container, enter_tab):
 	if enter_tab:
-		grab_focus()
+		self.grab_focus()
 

scenes/config/AboutSettings.tscn

@@ -74,9 +74,6 @@ expand_mode = 1
 stretch_mode = 5
 script = ExtResource("10")
 
-[node name="AccessibilityFocus" type="Node" parent="TabContainerHandler/TabContainer/About/VBoxContainer/HBoxContainer/Logo"]
-script = ExtResource("18")
-
 [node name="VBoxContainer" type="VBoxContainer" parent="TabContainerHandler/TabContainer/About/VBoxContainer/HBoxContainer"]
 layout_mode = 2
 size_flags_horizontal = 3
@@ -107,12 +104,12 @@ size_flags_horizontal = 8
 [node name="OpenWebsiteButton" type="Button" parent="TabContainerHandler/TabContainer/About/VBoxContainer/HBoxContainer/HFlowContainer"]
 unique_name_in_owner = true
 layout_mode = 2
-focus_neighbor_top = NodePath("../OpenIssuesButton")
+focus_neighbor_top = NodePath("../../../../../..")
 text = "Open project website"
 
 [node name="OpenIssuesButton" type="Button" parent="TabContainerHandler/TabContainer/About/VBoxContainer/HBoxContainer/HFlowContainer"]
 layout_mode = 2
-focus_neighbor_bottom = NodePath("../OpenWebsiteButton")
+focus_neighbor_bottom = NodePath("../../../../../..")
 text = "Report issues"
 
 [node name="HSeparator" type="HSeparator" parent="TabContainerHandler/TabContainer/About/VBoxContainer"]
@@ -156,6 +153,7 @@ script = ExtResource("9")
 [node name="Libraries" type="ScrollContainer" parent="TabContainerHandler/TabContainer"]
 visible = false
 layout_mode = 2
+follow_focus = true
 
 [node name="VBoxContainer" type="VBoxContainer" parent="TabContainerHandler/TabContainer/Libraries"]
 layout_mode = 2
@@ -508,6 +506,7 @@ script = ExtResource("9")
 [node name="Assets" type="ScrollContainer" parent="TabContainerHandler/TabContainer"]
 visible = false
 layout_mode = 2
+follow_focus = true
 
 [node name="VBoxContainer" type="VBoxContainer" parent="TabContainerHandler/TabContainer/Assets"]
 layout_mode = 2
@@ -699,6 +698,8 @@ anchor_bottom = 1.0
 unique_name_in_owner = true
 custom_minimum_size = Vector2(200, 0)
 layout_mode = 2
+focus_neighbor_top = NodePath("../../../..")
+focus_neighbor_bottom = NodePath("../../../..")
 hide_root = true
 
 [node name="AccessibilityFocus" type="Node" parent="TabContainerHandler/TabContainer/Licenses/HBoxContainer/Names"]

scenes/config/settings/InputSettings.tscn

@@ -83,6 +83,7 @@ size_flags_horizontal = 3
 size_flags_vertical = 3
 
 [node name="Keyboard" type="VBoxContainer" parent="ScrollContainer/VBoxContainer/TabContainerHandler/InputTab"]
+visible = false
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
@@ -747,7 +748,6 @@ script = ExtResource("44")
 next = NodePath("../../../../../../..")
 
 [node name="Virtual Keyboard" type="VBoxContainer" parent="ScrollContainer/VBoxContainer/TabContainerHandler/InputTab"]
-visible = false
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
@@ -826,6 +826,10 @@ layout_mode = 2
 focus_neighbor_bottom = NodePath("../../../../..")
 text = "On Mouse Click/Touch"
 
+[node name="AccessibilityFocus" type="Node" parent="ScrollContainer/VBoxContainer/TabContainerHandler/InputTab/Virtual Keyboard/HBoxContainer2/VBoxContainer/VirtualKeyboardOnMouse"]
+script = ExtResource("44")
+next = NodePath("../../../../../..")
+
 [node name="ControllerSlideLeft" type="TextureRect" parent="ScrollContainer/VBoxContainer/TabContainerHandler"]
 custom_minimum_size = Vector2(30, 30)
 layout_mode = 0

source/utils/TabContainerHandler.gd

@@ -58,6 +58,8 @@ func _input(event):
 			event.is_action_pressed("rh_accept")):
 			get_viewport().set_input_as_handled()
 			handle_focus(true)
+		elif _focused and event.is_action_pressed("ui_up"):
+			get_viewport().set_input_as_handled()
 
 func is_key_event_on_text(event: InputEvent):
 	if event is InputEventKey:
@@ -70,6 +72,7 @@ func _on_tab_clicked(_tab_idx: int):
 
 func handle_focus(enter_tab: bool):
 	RetroHubUI.play_sound(RetroHubUI.AudioKeys.SLIDE)
+	await get_tree().process_frame
 	if signal_tab_change:
 		emit_signal("tab_changed", tab, enter_tab)
 	elif enter_tab and tab.get_current_tab_control().focus_mode != FOCUS_NONE: