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

Merge pull request #89249 from /connect-signal-fix

This commit is contained in:
Rémi Verschelde 2024-03-12 14:22:56 +01:00
parent 22c20cea6e 3199c294f9
commit 9c99d4c3b4
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/classes/EditorSettings.xml
View File

@ -1014,6 +1014,9 @@
<member name="text_editor/behavior/navigation/move_caret_on_right_click" type="bool" setter="" getter="">
If [code]true[/code], the caret will be moved when right-clicking somewhere in the script editor (like when left-clicking or middle-clicking). If [code]false[/code], the caret will only be moved when left-clicking or middle-clicking somewhere.
</member>
<member name="text_editor/behavior/navigation/open_script_when_connecting_signal_to_existing_method" type="bool" setter="" getter="">
If [code]true[/code], opens the script editor when connecting a signal to an existing script method from the Node dock.
</member>
<member name="text_editor/behavior/navigation/scroll_past_end_of_file" type="bool" setter="" getter="">
If [code]true[/code], allows scrolling past the end of the file.
</member>

41
editor/connections_dialog.cpp
View File

@ -906,25 +906,34 @@ void ConnectionsDock::_make_or_edit_connection() {
bool b_oneshot = connect_dialog->get_one_shot();
cd.flags = CONNECT_PERSIST | (b_deferred ? CONNECT_DEFERRED : 0) | (b_oneshot ? CONNECT_ONE_SHOT : 0);
// Conditions to add function: must have a script and must not have the method already
// (in the class, the script itself, or inherited).
bool add_script_function = false;
// If the function is found in target's own script, check the editor setting
// to determine if the script should be opened.
// If the function is found in an inherited class or script no need to do anything
// except making a connection.
bool add_script_function_request = false;
Ref<Script> scr = target->get_script();
if (!scr.is_null() && !ClassDB::has_method(target->get_class(), cd.method)) {
// There is a chance that the method is inherited from another script.
bool found_inherited_function = false;
Ref<Script> inherited_scr = scr->get_base_script();
while (!inherited_scr.is_null()) {
int line = inherited_scr->get_language()->find_function(cd.method, inherited_scr->get_source_code());
if (line != -1) {
found_inherited_function = true;
break;
if (scr.is_valid() && !ClassDB::has_method(target->get_class(), cd.method)) {
// Check in target's own script.
int line = scr->get_language()->find_function(cd.method, scr->get_source_code());
if (line != -1) {
add_script_function_request = EDITOR_GET("text_editor/behavior/navigation/open_script_when_connecting_signal_to_existing_method");
} else {
// There is a chance that the method is inherited from another script.
bool found_inherited_function = false;
Ref<Script> inherited_scr = scr->get_base_script();
while (inherited_scr.is_valid()) {
int inherited_line = inherited_scr->get_language()->find_function(cd.method, inherited_scr->get_source_code());
if (inherited_line != -1) {
found_inherited_function = true;
break;
}
inherited_scr = inherited_scr->get_base_script();
}
inherited_scr = inherited_scr->get_base_script();
add_script_function_request = !found_inherited_function;
}
add_script_function = !found_inherited_function;
}
if (connect_dialog->is_editing()) {
@ -934,7 +943,7 @@ void ConnectionsDock::_make_or_edit_connection() {
_connect(cd);
}
if (add_script_function) {
if (add_script_function_request) {
PackedStringArray script_function_args = connect_dialog->get_signal_args();
script_function_args.resize(script_function_args.size() - cd.unbinds);
for (int i = 0; i < cd.binds.size(); i++) {

1
editor/editor_settings.cpp
View File

@ -626,6 +626,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "text_editor/behavior/navigation/v_scroll_speed", 80, "1,10000,1")
_initial_set("text_editor/behavior/navigation/drag_and_drop_selection", true);
_initial_set("text_editor/behavior/navigation/stay_in_script_editor_on_node_selected", true);
_initial_set("text_editor/behavior/navigation/open_script_when_connecting_signal_to_existing_method", true);
// Behavior: Indent
EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "text_editor/behavior/indent/type", 0, "Tabs,Spaces")