diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-06-07 17:37:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-07 17:37:09 +0200 |
commit | f0f16c76a593c31ca6906221417a1e77166c78d3 (patch) | |
tree | 01b4fbfc24e44e6c141231bf5242a1f82ed0fa6b /editor | |
parent | 69e6d6529538c011d5afd4c6671b4317c2359219 (diff) | |
parent | f0469fddfeb55f4d798a836ca4aae5cbad3f4b58 (diff) |
Merge pull request #49296 from NoFr1ends/fix-49294
EditorSettings: Look for binding while filtering too
Diffstat (limited to 'editor')
-rw-r--r-- | editor/settings_config_dialog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp index 4cdf820877..c05a3c2f89 100644 --- a/editor/settings_config_dialog.cpp +++ b/editor/settings_config_dialog.cpp @@ -261,10 +261,6 @@ void EditorSettingsDialog::_update_shortcuts() { for (OrderedHashMap<StringName, InputMap::Action>::Element E = action_map.front(); E; E = E.next()) { String action_name = E.key(); - if (!shortcut_filter.is_subsequence_ofi(action_name)) { - continue; - } - InputMap::Action action = E.get(); Array events; // Need to get the list of events into an array so it can be set as metadata on the item. @@ -298,6 +294,10 @@ void EditorSettingsDialog::_update_shortcuts() { // Join the text of the events with a delimiter so they can all be displayed in one cell. String events_display_string = event_strings.is_empty() ? "None" : String("; ").join(event_strings); + if (!shortcut_filter.is_subsequence_ofi(action_name) && (events_display_string == "None" || !shortcut_filter.is_subsequence_ofi(events_display_string))) { + continue; + } + TreeItem *item = shortcuts->create_item(common_section); item->set_text(0, action_name); item->set_text(1, events_display_string); |