Merge pull request #108741 from AriaTheCurseling/Allow-concurrent-unbind-and-binding-of-signal-arguments-in-editor

Allow concurrent unbinding and binding of signal arguments in editor

editor/scene/connections_dialog.cpp

@@ -219,22 +219,6 @@ void ConnectDialog::_focus_currently_connected() {
 	tree->set_selected(Object::cast_to<Node>(source));
 }
 
-void ConnectDialog::_unbind_count_changed(double p_count) {
-	for (Control *control : bind_controls) {
-		BaseButton *b = Object::cast_to<BaseButton>(control);
-		if (b) {
-			b->set_disabled(p_count > 0);
-		}
-
-		EditorInspector *e = Object::cast_to<EditorInspector>(control);
-		if (e) {
-			e->set_read_only(p_count > 0);
-		}
-	}
-
-	append_source->set_disabled(p_count > 0);
-}
-
 void ConnectDialog::_method_selected() {
 	TreeItem *selected_item = method_tree->get_selected();
 	dst_method->set_text(selected_item->get_metadata(0));
@@ -330,10 +314,9 @@ List<MethodInfo> ConnectDialog::_filter_method_list(const List<MethodInfo> &p_me
 		PropertyInfo pi = p_signal.arguments[i];
 		effective_args.push_back(Pair(pi.type, pi.class_name));
 	}
-	if (unbind == 0) {
-		for (const Variant &variant : get_binds()) {
-			effective_args.push_back(Pair(variant.get_type(), StringName()));
-		}
+
+	for (const Variant &variant : get_binds()) {
+		effective_args.push_back(Pair(variant.get_type(), StringName()));
 	}
 
 	for (const MethodInfo &mi : p_methods) {
@@ -723,7 +706,6 @@ void ConnectDialog::init(const ConnectionData &p_cd, const PackedStringArray &p_
 
 	unbind_count->set_max(p_signal_args.size());
 	unbind_count->set_value(p_cd.unbinds);
-	_unbind_count_changed(p_cd.unbinds);
 
 	cdbinds->params.clear();
 	cdbinds->params = p_cd.binds;
@@ -909,7 +891,6 @@ ConnectDialog::ConnectDialog() {
 	unbind_count = memnew(SpinBox);
 	unbind_count->set_tooltip_text(TTR("Allows to drop arguments sent by signal emitter."));
 	unbind_count->set_accessibility_name(TTRC("Unbind Signal Arguments:"));
-	unbind_count->connect(SceneStringName(value_changed), callable_mp(this, &ConnectDialog::_unbind_count_changed));
 
 	vbc_right->add_margin_child(TTR("Unbind Signal Arguments:"), unbind_count);
 
@@ -1001,9 +982,8 @@ void ConnectionsDock::_make_or_edit_connection() {
 	cd.signal = connect_dialog->get_signal_name();
 	cd.method = connect_dialog->get_dst_method_name();
 	cd.unbinds = connect_dialog->get_unbinds();
-	if (cd.unbinds == 0) {
-		cd.binds = connect_dialog->get_binds();
-	}
+	cd.binds = connect_dialog->get_binds();
+
 	bool b_deferred = connect_dialog->get_deferred();
 	bool b_oneshot = connect_dialog->get_one_shot();
 	bool b_append_source = connect_dialog->get_append_source();
@@ -1685,7 +1665,8 @@ void ConnectionsDock::update_tree() {
 				}
 				if (cd.unbinds > 0) {
 					path += " unbinds(" + itos(cd.unbinds) + ")";
-				} else if (!cd.binds.is_empty()) {
+				}
+				if (!cd.binds.is_empty()) {
 					path += " binds(";
 					for (int i = 0; i < cd.binds.size(); i++) {
 						if (i > 0) {

editor/scene/connections_dialog.h

@@ -73,20 +73,22 @@ public:
 				CallableCustomBind *ccb = dynamic_cast<CallableCustomBind *>(p_connection.callable.get_custom());
 				if (ccb) {
 					binds = ccb->get_binds();
-
-					// The source object may already be bound, ignore it to prevent display of the source object.
-					if ((flags & CONNECT_APPEND_SOURCE_OBJECT) && (source == binds[0])) {
-						binds.remove_at(0);
-					}
+					unbinds = ccb->get_unbound_arguments_count();
 
 					base_callable = ccb->get_callable();
 				}
 
 				CallableCustomUnbind *ccu = dynamic_cast<CallableCustomUnbind *>(p_connection.callable.get_custom());
 				if (ccu) {
+					ccu->get_bound_arguments(binds);
 					unbinds = ccu->get_unbinds();
 					base_callable = ccu->get_callable();
 				}
+
+				// The source object may already be bound, ignore it to prevent display of the source object.
+				if ((flags & CONNECT_APPEND_SOURCE_OBJECT) && (source == binds[0])) {
+					binds.remove_at(0);
+				}
 			} else {
 				base_callable = p_connection.callable;
 			}
@@ -94,17 +96,21 @@ public:
 		}
 
 		Callable get_callable() const {
-			if (unbinds > 0) {
-				return Callable(target, method).unbind(unbinds);
-			} else if (!binds.is_empty()) {
+			Callable callable = Callable(target, method);
+
+			if (!binds.is_empty()) {
 				const Variant **argptrs = (const Variant **)alloca(sizeof(Variant *) * binds.size());
 				for (int i = 0; i < binds.size(); i++) {
 					argptrs[i] = &binds[i];
 				}
-				return Callable(target, method).bindp(argptrs, binds.size());
-			} else {
-				return Callable(target, method);
+				callable = callable.bindp(argptrs, binds.size());
 			}
+
+			if (unbinds > 0) {
+				callable = callable.unbind(unbinds);
+			}
+
+			return callable;
 		}
 	};
 

scene/resources/packed_scene.cpp

@@ -663,23 +663,22 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
 		}
 
 		Callable callable(cto, snames[c.method]);
-		if (c.unbinds > 0) {
-			callable = callable.unbind(c.unbinds);
-		} else {
-			Array binds;
-			if (c.flags & CONNECT_APPEND_SOURCE_OBJECT) {
-				binds.push_back(cfrom);
-			}
 
-			if (!c.binds.is_empty()) {
-				for (int j = 0; j < c.binds.size(); j++) {
-					binds.push_back(props[c.binds[j]]);
-				}
-			}
+		Array binds;
+		if (c.flags & CONNECT_APPEND_SOURCE_OBJECT) {
+			binds.push_back(cfrom);
+		}
 
-			if (!binds.is_empty()) {
-				callable = callable.bindv(binds);
-			}
+		for (int bind : c.binds) {
+			binds.push_back(props[bind]);
+		}
+
+		if (!binds.is_empty()) {
+			callable = callable.bindv(binds);
+		}
+
+		if (c.unbinds > 0) {
+			callable = callable.unbind(c.unbinds);
 		}
 
 		cfrom->connect(snames[c.signal], callable, CONNECT_PERSIST | c.flags | (p_edit_state == GEN_EDIT_STATE_MAIN ? 0 : CONNECT_INHERITED));
@@ -1179,20 +1178,22 @@ Error SceneState::_parse_connections(Node *p_owner, Node *p_node, HashMap<String
 				CallableCustomBind *ccb = dynamic_cast<CallableCustomBind *>(c.callable.get_custom());
 				if (ccb) {
 					binds = ccb->get_binds();
-
-					// The source object may already be bound, ignore it to avoid saving the source object.
-					if ((c.flags & CONNECT_APPEND_SOURCE_OBJECT) && (p_node == binds[0])) {
-						binds.remove_at(0);
-					}
+					unbinds = ccb->get_unbound_arguments_count();
 
 					base_callable = ccb->get_callable();
 				}
 
 				CallableCustomUnbind *ccu = dynamic_cast<CallableCustomUnbind *>(c.callable.get_custom());
 				if (ccu) {
+					ccu->get_bound_arguments(binds);
 					unbinds = ccu->get_unbinds();
 					base_callable = ccu->get_callable();
 				}
+
+				// The source object may already be bound, ignore it to avoid saving the source object.
+				if ((c.flags & CONNECT_APPEND_SOURCE_OBJECT) && (p_node == binds[0])) {
+					binds.remove_at(0);
+				}
 			} else {
 				base_callable = c.callable;
 			}