godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Merge pull request #52849 from KoBeWi/know_no_binds

Browse Source
This commit is contained in:
Rémi Verschelde
2021-09-25 00:10:56 +02:00
committed by GitHub
parent 442c65f359 7bf5fc709e
commit 0abe464162
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/variant/callable.cpp
View File

@@ -377,11 +377,11 @@ Error Signal::emit(const Variant **p_arguments, int p_argcount) const {
return obj->emit_signal(name, p_arguments, p_argcount); return obj->emit_signal(name, p_arguments, p_argcount);
} }
Error Signal::connect(const Callable &p_callable, const Vector<Variant> &p_binds, uint32_t p_flags) { Error Signal::connect(const Callable &p_callable, uint32_t p_flags) {
Object *object = get_object(); Object *object = get_object();
ERR_FAIL_COND_V(!object, ERR_UNCONFIGURED); ERR_FAIL_COND_V(!object, ERR_UNCONFIGURED);
return object->connect(name, p_callable, p_binds, p_flags); return object->connect(name, p_callable, varray(), p_flags);
} }
void Signal::disconnect(const Callable &p_callable) { void Signal::disconnect(const Callable &p_callable) {

2
core/variant/callable.h
View File

@@ -159,7 +159,7 @@ public:
operator String() const; operator String() const;
Error emit(const Variant **p_arguments, int p_argcount) const; Error emit(const Variant **p_arguments, int p_argcount) const;
Error connect(const Callable &p_callable, const Vector<Variant> &p_binds = Vector<Variant>(), uint32_t p_flags = 0); Error connect(const Callable &p_callable, uint32_t p_flags = 0);
void disconnect(const Callable &p_callable); void disconnect(const Callable &p_callable);
bool is_connected(const Callable &p_callable) const; bool is_connected(const Callable &p_callable) const;

2
core/variant/variant_call.cpp
View File

@@ -1690,7 +1690,7 @@ static void _register_variant_builtin_methods() {
bind_method(Signal, get_object_id, sarray(), varray()); bind_method(Signal, get_object_id, sarray(), varray());
bind_method(Signal, get_name, sarray(), varray()); bind_method(Signal, get_name, sarray(), varray());
bind_method(Signal, connect, sarray("callable", "binds", "flags"), varray(Array(), 0)); bind_method(Signal, connect, sarray("callable", "flags"), varray(0));
bind_method(Signal, disconnect, sarray("callable"), varray()); bind_method(Signal, disconnect, sarray("callable"), varray());
bind_method(Signal, is_connected, sarray("callable"), varray()); bind_method(Signal, is_connected, sarray("callable"), varray());
bind_method(Signal, get_connections, sarray(), varray()); bind_method(Signal, get_connections, sarray(), varray());

12
doc/classes/Signal.xml
View File

@@ -32,10 +32,16 @@
<method name="connect"> <method name="connect">
<return type="int" /> <return type="int" />
<argument index="0" name="callable" type="Callable" /> <argument index="0" name="callable" type="Callable" />
<argument index="1" name="binds" type="Array" default="[]" /> <argument index="1" name="flags" type="int" default="0" />
<argument index="2" name="flags" type="int" default="0" />
<description> <description>
Connects this signal to the specified [Callable], optionally providing binds and connection flags. Connects this signal to the specified [Callable], optionally providing connection flags. You can provide additional arguments to the connected method call by using [method Callable.bind].
[codeblock]
for button in $Buttons.get_children():
button.pressed.connect(on_pressed.bind(button))
func on_pressed(button):
print(button.name, " was pressed")
[/codeblock]
</description> </description>
</method> </method>
<method name="disconnect"> <method name="disconnect">

2
modules/gdscript/gdscript_vm.cpp
View File

@@ -2138,7 +2138,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
retvalue = gdfs; retvalue = gdfs;
Error err = sig.connect(Callable(gdfs.ptr(), "_signal_callback"), varray(gdfs), Object::CONNECT_ONESHOT); Error err = sig.connect(callable_bind(Callable(gdfs.ptr(), "_signal_callback"), retvalue), Object::CONNECT_ONESHOT);
if (err != OK) { if (err != OK) {
err_text = "Error connecting to signal: " + sig.get_name() + " during await."; err_text = "Error connecting to signal: " + sig.get_name() + " during await.";
OPCODE_BREAK; OPCODE_BREAK;