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 #87870 from ryevdokimov/remove-unnecessary-focus-methods

Browse Source 
Remove unnecessary focus methods and directly bind to `set_close_on_escape`
This commit is contained in:
Rémi Verschelde
2024-03-11 23:48:13 +01:00
parent 058202e960 690fd15356
commit c0ad0b0acf
4 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
editor/project_settings_editor.cpp
View File

@@ -600,14 +600,6 @@ void ProjectSettingsEditor::_update_theme() {
}
}
void ProjectSettingsEditor::_input_filter_focused() {
set_close_on_escape(false);
}
void ProjectSettingsEditor::_input_filter_unfocused() {
set_close_on_escape(true);
}
void ProjectSettingsEditor::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_VISIBILITY_CHANGED: {
@@ -740,8 +732,8 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
action_map_editor->connect("action_removed", callable_mp(this, &ProjectSettingsEditor::_action_removed));
action_map_editor->connect("action_renamed", callable_mp(this, &ProjectSettingsEditor::_action_renamed));
action_map_editor->connect("action_reordered", callable_mp(this, &ProjectSettingsEditor::_action_reordered));
action_map_editor->connect(SNAME("filter_focused"), callable_mp(this, &ProjectSettingsEditor::_input_filter_focused));
action_map_editor->connect(SNAME("filter_unfocused"), callable_mp(this, &ProjectSettingsEditor::_input_filter_unfocused));
action_map_editor->connect(SNAME("filter_focused"), callable_mp((AcceptDialog *)this, &AcceptDialog::set_close_on_escape).bind(false));
action_map_editor->connect(SNAME("filter_unfocused"), callable_mp((AcceptDialog *)this, &AcceptDialog::set_close_on_escape).bind(true));
tab_container->add_child(action_map_editor);
localization_editor = memnew(LocalizationEditor);