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

Merge pull request #42109 from EricEzaM/PR/input-and-shortcuts-rework

Browse Source 
Shortcuts rework - fixed issues with input propagation and triggering of unwanted shortcuts.
This commit is contained in:
Rémi Verschelde
2020-11-28 09:04:25 +01:00
committed by GitHub
parent a6751e6c58 7941235e06
commit a09846e015
29 changed files with 180 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/plugins/animation_player_editor_plugin.cpp
View File

@@ -1212,9 +1212,11 @@ void AnimationPlayerEditor::_unhandled_key_input(const Ref<InputEvent> &p_ev) {
} else {
_play_bw_pressed();
}
accept_event();
} break;
case KEY_S: {
_stop_pressed();
accept_event();
} break;
case KEY_D: {
if (!k->get_shift()) {
@@ -1222,6 +1224,7 @@ void AnimationPlayerEditor::_unhandled_key_input(const Ref<InputEvent> &p_ev) {
} else {
_play_pressed();
}
accept_event();
} break;
}
}
@@ -1547,6 +1550,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor, AnimationPlay
delete_dialog->connect("confirmed", callable_mp(this, &AnimationPlayerEditor::_animation_remove_confirmed));
tool_anim = memnew(MenuButton);
tool_anim->set_shortcut_context(this);
tool_anim->set_flat(false);
tool_anim->set_tooltip(TTR("Animation Tools"));
tool_anim->set_text(TTR("Animation"));