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

Merge pull request #47596 from EricEzaM/PR/fix-editor-settings-shortcuts-wrong-button-action 

Fixed Editor Shortcuts revert/edit/clear buttons performing the wrong action
This commit is contained in:
Rémi Verschelde 2021-04-10 11:04:50 +02:00 committed by GitHub
parent 81fc9fa1dc 2a673ff133
commit d3c492b7d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/settings_config_dialog.cpp
View File

@ -393,9 +393,10 @@ void EditorSettingsDialog::_shortcut_button_pressed(Object *p_item, int p_column
TreeItem *ti = Object::cast_to<TreeItem>(p_item); TreeItem *ti = Object::cast_to<TreeItem>(p_item);
ERR_FAIL_COND(!ti); ERR_FAIL_COND(!ti);
button_idx = p_idx;
if (ti->get_metadata(0) == "Common") { if (ti->get_metadata(0) == "Common") {
// Editing a Built-in action, which can have multiple bindings. // Editing a Built-in action, which can have multiple bindings.
button_idx = p_idx;
editing_action = true; editing_action = true;
current_action = ti->get_text(0); current_action = ti->get_text(0);