From 690fd153567e176251068ddac2aa02ce270c1473 Mon Sep 17 00:00:00 2001 From: Robert Yevdokimov Date: Fri, 2 Feb 2024 09:03:38 -0500 Subject: Remove unnecessary focus methods and directly bind to 'set_close_on_escape' --- editor/project_settings_editor.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'editor/project_settings_editor.cpp') diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index e59bb76ff4..1b2b79527d 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -575,14 +575,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: { @@ -715,8 +707,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); -- cgit v1.2.3