godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #60187 from Rindbee/clamp-the-unbind-range-in-connection-dialog 

Limit the maximum value of unbinds in the connection dialog to signal_argument_size
This commit is contained in:
Rémi Verschelde 2022-04-28 08:14:23 +02:00 committed by GitHub
parent 504708ae21 fbba40f04d
commit 69a9f1acc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
editor/connections_dialog.cpp
View File

@ -365,6 +365,24 @@ void ConnectDialog::init(ConnectionData p_cd, bool p_edit) {
deferred->set_pressed(b_deferred); deferred->set_pressed(b_deferred);
oneshot->set_pressed(b_oneshot); oneshot->set_pressed(b_oneshot);
MethodInfo r_signal;
Ref<Script> source_script = source->get_script();
if (source_script.is_valid() && source_script->has_script_signal(signal)) {
List<MethodInfo> signals;
source_script->get_script_signal_list(&signals);
for (MethodInfo &mi : signals) {
if (mi.name == signal) {
r_signal = mi;
break;
}
}
} else {
ClassDB::get_signal(source->get_class(), signal, &r_signal);
}
unbind_count->set_max(r_signal.arguments.size());
unbind_count->set_value(p_cd.unbinds); unbind_count->set_value(p_cd.unbinds);
_unbind_count_changed(p_cd.unbinds); _unbind_count_changed(p_cd.unbinds);
@ -619,6 +637,7 @@ void ConnectionsDock::_make_or_edit_connection() {
if (add_script_function) { if (add_script_function) {
// Pick up args here before "it" is deleted by update_tree. // Pick up args here before "it" is deleted by update_tree.
script_function_args = it->get_metadata(0).operator Dictionary()["args"]; script_function_args = it->get_metadata(0).operator Dictionary()["args"];
script_function_args.resize(script_function_args.size() - cd.unbinds);
for (int i = 0; i < cd.binds.size(); i++) { for (int i = 0; i < cd.binds.size(); i++) {
script_function_args.push_back("extra_arg_" + itos(i) + ":" + Variant::get_type_name(cd.binds[i].get_type())); script_function_args.push_back("extra_arg_" + itos(i) + ":" + Variant::get_type_name(cd.binds[i].get_type()));
} }