godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #100334 from Sauermann/fix-editor-shortcut-reconversion

Browse Source 
Introduce a conversion for editor shortcuts
This commit is contained in:
Thaddeus Crews
2024-12-13 16:19:28 -06:00
parent d7e4b9e31b cfc0a87099
commit 28c02a8491
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/editor_settings.cpp
View File

@@ -103,6 +103,14 @@ bool EditorSettings::_set_only(const StringName &p_name, const Variant &p_value)
builtin_action_overrides[action_name].clear(); builtin_action_overrides[action_name].clear();
for (int ev_idx = 0; ev_idx < events.size(); ev_idx++) { for (int ev_idx = 0; ev_idx < events.size(); ev_idx++) {
#ifndef DISABLE_DEPRECATED
// -3 was introduced in GH-97707 as a way to prevent a clash in device IDs, but as reported in GH-99243, this leads to problems.
// -3 was used during dev-releases, so this conversion helps to revert such affected editor shortcuts.
Ref<InputEvent> x = events[ev_idx];
if (x.is_valid() && x->get_device() == -3) {
x->set_device(-1);
}
#endif // DISABLE_DEPRECATED
im->action_add_event(action_name, events[ev_idx]); im->action_add_event(action_name, events[ev_idx]);
builtin_action_overrides[action_name].push_back(events[ev_idx]); builtin_action_overrides[action_name].push_back(events[ev_idx]);
} }