From e42b054e8632f6c40d4af5e2b9fdc380fe098a48 Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Mon, 28 May 2018 21:45:13 +0000 Subject: [PATCH] Apparently these _s aren't needed. --- addons/accessibility/accessibility.gd | 12 ++++++------ addons/accessibility/accessible.gd | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/accessibility/accessibility.gd b/addons/accessibility/accessibility.gd index 52ac58f..baad3a5 100644 --- a/addons/accessibility/accessibility.gd +++ b/addons/accessibility/accessibility.gd @@ -3,12 +3,12 @@ extends EditorPlugin var Accessible = preload("accessible.gd") -func _augment_node(node): +func augment_node(node): if node is Control: node.set_focus_mode(Control.FOCUS_ALL) Accessible.new(node) -func _set_initial_screen_focus(screen): +func set_initial_screen_focus(screen): print("Screen ",screen) var focus var root = self @@ -20,13 +20,13 @@ func _set_initial_screen_focus(screen): focus.grab_click_focus() focus.grab_focus() -func _set_initial_scene_focus(scene): +func set_initial_scene_focus(scene): print("Set focus in scene") func _enter_tree(): - get_tree().connect("node_added", self, "_augment_node") - connect("scene_changed", self, "_set_initial_scene_focus") - connect("main_screen_changed", self, "_set_initial_screen_focus") + get_tree().connect("node_added", self, "augment_node") + connect("scene_changed", self, "set_initial_scene_focus") + connect("main_screen_changed", self, "set_initial_screen_focus") func _exit_tree(): # Clean-up of the plugin goes here diff --git a/addons/accessibility/accessible.gd b/addons/accessibility/accessible.gd index 911013e..1cec189 100644 --- a/addons/accessibility/accessible.gd +++ b/addons/accessibility/accessible.gd @@ -2,21 +2,21 @@ extends Object var node -func _focused(): +func focused(): print("Focus entered.") -func _unfocused(): +func unfocused(): print("Unfocused") -func _gui_input(): +func gui_input(): print("GUI input.") func _init(node): # print(node.get_path()) self.node = node - self.node.connect("focus_entered", self, "_focused") - self.node.connect("mouse_entered", self, "_focused") - self.node.connect("focus_exited", self, "_unfocused") - self.node.connect("mouse_exited", self, "_unfocused") - self.node.connect("gui_input", self, "_gui_input") + self.node.connect("focus_entered", self, "focused") + self.node.connect("mouse_entered", self, "focused") + self.node.connect("focus_exited", self, "unfocused") + self.node.connect("mouse_exited", self, "unfocused") + self.node.connect("gui_input", self, "gui_input") self.node.connect("tree_exiting", self, "free")