Add right click popup to connections in conections to method dialog.

godotengine · Dec 27, 2024 · abb0746 · abb0746
1 parent 0f95e9f
commit abb0746
Show file tree

Hide file tree

Showing 4 changed files with 336 additions and 49 deletions.
diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp
@@ -1000,7 +1000,7 @@ void ConnectionsDock::_make_or_edit_connection() {
 /*
  * Creates single connection w/ undo-redo functionality.
  */
-void ConnectionsDock::_connect(const ConnectDialog::ConnectionData &p_cd) {
+void ConnectionsDock::_connect(const ConnectDialog::ConnectionData &p_cd, const bool &commit_action) {
 	Node *source = Object::cast_to<Node>(p_cd.source);
 	Node *target = Object::cast_to<Node>(p_cd.target);
 
@@ -1018,13 +1018,15 @@ void ConnectionsDock::_connect(const ConnectDialog::ConnectionData &p_cd) {
 	undo_redo->add_do_method(SceneTreeDock::get_singleton()->get_tree_editor(), "update_tree"); // To force redraw of scene tree.
 	undo_redo->add_undo_method(SceneTreeDock::get_singleton()->get_tree_editor(), "update_tree");
 
-	undo_redo->commit_action();
+	if (commit_action) {
+		undo_redo->commit_action();
+	}
 }
 
 /*
  * Break single connection w/ undo-redo functionality.
  */
-void ConnectionsDock::_disconnect(const ConnectDialog::ConnectionData &p_cd) {
+void ConnectionsDock::_disconnect(const ConnectDialog::ConnectionData &p_cd, const bool &commit_action) {
 	ERR_FAIL_COND(p_cd.source != selected_node); // Shouldn't happen but... Bugcheck.
 
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
@@ -1038,7 +1040,9 @@ void ConnectionsDock::_disconnect(const ConnectDialog::ConnectionData &p_cd) {
 	undo_redo->add_do_method(SceneTreeDock::get_singleton()->get_tree_editor(), "update_tree"); // To force redraw of scene tree.
 	undo_redo->add_undo_method(SceneTreeDock::get_singleton()->get_tree_editor(), "update_tree");
 
-	undo_redo->commit_action();
+	if (commit_action) {
+		undo_redo->commit_action();
+	}
 }
 
 /*
@@ -1589,6 +1593,8 @@ void ConnectionsDock::update_tree() {
 	connect_button->set_disabled(true);
 }
 
+ConnectionsDock *ConnectionsDock::singleton = nullptr;
+
 ConnectionsDock::ConnectionsDock() {
 	set_name(TTR("Signals"));
 
@@ -1657,6 +1663,8 @@ ConnectionsDock::ConnectionsDock() {
 	tree->connect(SceneStringName(gui_input), callable_mp(this, &ConnectionsDock::_tree_gui_input));
 
 	add_theme_constant_override("separation", 3 * EDSCALE);
+
+	singleton = this;
 }
 
 ConnectionsDock::~ConnectionsDock() {

diff --git a/editor/connections_dialog.h b/editor/connections_dialog.h
@@ -199,6 +199,8 @@ class ConnectionsDockTree : public Tree {
 class ConnectionsDock : public VBoxContainer {
 	GDCLASS(ConnectionsDock, VBoxContainer);
 
+	static ConnectionsDock *singleton;
+
 	enum TreeItemType {
 		TREE_ITEM_TYPE_ROOT,
 		TREE_ITEM_TYPE_CLASS,
@@ -237,8 +239,8 @@ class ConnectionsDock : public VBoxContainer {
 	void _filter_changed(const String &p_text);
 
 	void _make_or_edit_connection();
-	void _connect(const ConnectDialog::ConnectionData &p_cd);
-	void _disconnect(const ConnectDialog::ConnectionData &p_cd);
+	void _connect(const ConnectDialog::ConnectionData &p_cd, const bool &commit_action = true);
+	void _disconnect(const ConnectDialog::ConnectionData &p_cd, const bool &commit_action = true);
 	void _disconnect_all();
 
 	void _tree_item_selected();
@@ -265,6 +267,13 @@ class ConnectionsDock : public VBoxContainer {
 	static void _bind_methods();
 
 public:
+	static ConnectionsDock *get_singleton() { return singleton; }
+	void connect_connection(const ConnectDialog::ConnectionData &p_cd, const bool &commit_action = true) {
+		_connect(p_cd, commit_action);
+	}
+	void disconnect_connection(const ConnectDialog::ConnectionData &p_cd, const bool &commit_action = true) {
+		_disconnect(p_cd, commit_action);
+	}
 	void set_node(Node *p_node);
 	void update_tree();