godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #56575 from HaSa1002/drag-signal-began

Browse Source 
Rename GraphEdit `connection_drag_begun` to `connection_drag_started`
This commit is contained in:
Rémi Verschelde
2022-01-07 20:41:39 +01:00
committed by GitHub
parent 6e4da909aa 4c5ceb1a97
commit c09c4e0154
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
doc/classes/GraphEdit.xml
View File

@@ -113,7 +113,7 @@
<return type="void" /> <return type="void" />
<description> <description>
Ends the creation of the current connection. In other words, if you are dragging a connection you can use this method to abort the process and remove the line that followed your cursor. Ends the creation of the current connection. In other words, if you are dragging a connection you can use this method to abort the process and remove the line that followed your cursor.
This is best used together with [signal connection_drag_begun] and [signal connection_drag_ended] to add custom behavior like node addition through shortcuts. This is best used together with [signal connection_drag_started] and [signal connection_drag_ended] to add custom behavior like node addition through shortcuts.
[b]Note:[/b] This method suppresses any other connection request signals apart from [signal connection_drag_ended]. [b]Note:[/b] This method suppresses any other connection request signals apart from [signal connection_drag_ended].
</description> </description>
</method> </method>
@@ -249,7 +249,12 @@
Emitted at the beginning of a GraphNode movement. Emitted at the beginning of a GraphNode movement.
</description> </description>
</signal> </signal>
<signal name="connection_drag_begun"> <signal name="connection_drag_ended">
<description>
Emitted at the end of a connection drag.
</description>
</signal>
<signal name="connection_drag_started">
<argument index="0" name="from" type="String" /> <argument index="0" name="from" type="String" />
<argument index="1" name="slot" type="String" /> <argument index="1" name="slot" type="String" />
<argument index="2" name="is_output" type="bool" /> <argument index="2" name="is_output" type="bool" />
@@ -257,11 +262,6 @@
Emitted at the beginning of a connection drag. Emitted at the beginning of a connection drag.
</description> </description>
</signal> </signal>
<signal name="connection_drag_ended">
<description>
Emitted at the end of a connection drag.
</description>
</signal>
<signal name="connection_from_empty"> <signal name="connection_from_empty">
<argument index="0" name="to" type="StringName" /> <argument index="0" name="to" type="StringName" />
<argument index="1" name="to_slot" type="int" /> <argument index="1" name="to_slot" type="int" />

10
scene/gui/graph_edit.cpp
View File

@@ -600,7 +600,7 @@ void GraphEdit::_top_layer_input(const Ref<InputEvent> &p_ev) {
to = get_node(String(connecting_from)); //maybe it was erased to = get_node(String(connecting_from)); //maybe it was erased
if (Object::cast_to<GraphNode>(to)) { if (Object::cast_to<GraphNode>(to)) {
connecting = true; connecting = true;
emit_signal(SNAME("connection_drag_begun"), connecting_from, connecting_index, false); emit_signal(SNAME("connection_drag_started"), connecting_from, connecting_index, false);
} }
return; return;
} }
@@ -617,7 +617,7 @@ void GraphEdit::_top_layer_input(const Ref<InputEvent> &p_ev) {
connecting_target = false; connecting_target = false;
connecting_to = pos; connecting_to = pos;
just_disconnected = false; just_disconnected = false;
emit_signal(SNAME("connection_drag_begun"), connecting_from, connecting_index, true); emit_signal(SNAME("connection_drag_started"), connecting_from, connecting_index, true);
return; return;
} }
} }
@@ -644,7 +644,7 @@ void GraphEdit::_top_layer_input(const Ref<InputEvent> &p_ev) {
fr = get_node(String(connecting_from)); //maybe it was erased fr = get_node(String(connecting_from)); //maybe it was erased
if (Object::cast_to<GraphNode>(fr)) { if (Object::cast_to<GraphNode>(fr)) {
connecting = true; connecting = true;
emit_signal(SNAME("connection_drag_begun"), connecting_from, connecting_index, true); emit_signal(SNAME("connection_drag_started"), connecting_from, connecting_index, true);
} }
return; return;
} }
@@ -661,7 +661,7 @@ void GraphEdit::_top_layer_input(const Ref<InputEvent> &p_ev) {
connecting_target = false; connecting_target = false;
connecting_to = pos; connecting_to = pos;
just_disconnected = false; just_disconnected = false;
emit_signal(SNAME("connection_drag_begun"), connecting_from, connecting_index, false); emit_signal(SNAME("connection_drag_started"), connecting_from, connecting_index, false);
return; return;
} }
} }
@@ -2275,7 +2275,7 @@ void GraphEdit::_bind_methods() {
ADD_SIGNAL(MethodInfo("begin_node_move")); ADD_SIGNAL(MethodInfo("begin_node_move"));
ADD_SIGNAL(MethodInfo("end_node_move")); ADD_SIGNAL(MethodInfo("end_node_move"));
ADD_SIGNAL(MethodInfo("scroll_offset_changed", PropertyInfo(Variant::VECTOR2, "ofs"))); ADD_SIGNAL(MethodInfo("scroll_offset_changed", PropertyInfo(Variant::VECTOR2, "ofs")));
ADD_SIGNAL(MethodInfo("connection_drag_begun", PropertyInfo(Variant::STRING, "from"), PropertyInfo(Variant::STRING, "slot"), PropertyInfo(Variant::BOOL, "is_output"))); ADD_SIGNAL(MethodInfo("connection_drag_started", PropertyInfo(Variant::STRING, "from"), PropertyInfo(Variant::STRING, "slot"), PropertyInfo(Variant::BOOL, "is_output")));
ADD_SIGNAL(MethodInfo("connection_drag_ended")); ADD_SIGNAL(MethodInfo("connection_drag_ended"));
} }