From 4eb49cc73241e0597174c4bfdfdddaf96dce86af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 1 Apr 2016 08:39:06 +0200 Subject: [PATCH] Fix last two bindings in input_mapping demo Also connect the signal from script, as it makes it easier to understand than by having to check the connected signals via the GUI. --- demos/gui/input_mapping/controls.gd | 4 +++- demos/gui/input_mapping/controls.scn | Bin 2698 -> 2026 bytes 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/demos/gui/input_mapping/controls.gd b/demos/gui/input_mapping/controls.gd index 3cee6e6871..f337353796 100644 --- a/demos/gui/input_mapping/controls.gd +++ b/demos/gui/input_mapping/controls.gd @@ -51,4 +51,6 @@ func _ready(): # We assume that the key binding that we want is the first one (0), if there are several input_event = InputMap.get_action_list(action)[0] # See note at the beginning of the script - get_node("bindings").get_node(action).get_node("Button").set_text(OS.get_scancode_string(input_event.scancode)) + var button = get_node("bindings").get_node(action).get_node("Button") + button.set_text(OS.get_scancode_string(input_event.scancode)) + button.connect("pressed", self, "wait_for_input", [action]) diff --git a/demos/gui/input_mapping/controls.scn b/demos/gui/input_mapping/controls.scn index 98cbbca4645aa0eb8bba7c0368b8f6c0b2dcf55e..7894212fb7f385907ffcb5c2e1fd53509b584455 100644 GIT binary patch delta 1885 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 Z4>>vUFnGH1`MIofN@xlS4sr%H^8m