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

Fix key names being wrongly capitalized in the input map editor

Browse Source 
This also fixes the prompt in the editor shortcuts dialog
while removing duplicated code.

This closes #33305.
This commit is contained in:
Hugo Locurcio
2019-11-04 15:22:30 +01:00
parent 86da206b84
commit b14e391792
2 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
editor/project_settings_editor.cpp
View File

@@ -442,15 +442,7 @@ void ProjectSettingsEditor::_wait_for_key(const Ref<InputEvent> &p_event) {
if (k.is_valid() && k->is_pressed() && k->get_scancode() != 0) { if (k.is_valid() && k->is_pressed() && k->get_scancode() != 0) {
last_wait_for_key = p_event; last_wait_for_key = p_event;
String str = keycode_get_string(k->get_scancode()).capitalize(); const String str = keycode_get_string(k->get_scancode_with_modifiers());
if (k->get_metakey())
str = vformat("%s+", find_keycode_name(KEY_META)) + str;
if (k->get_shift())
str = TTR("Shift+") + str;
if (k->get_alt())
str = TTR("Alt+") + str;
if (k->get_control())
str = TTR("Control+") + str;
press_a_key_label->set_text(str); press_a_key_label->set_text(str);
press_a_key->accept_event(); press_a_key->accept_event();
@@ -740,15 +732,7 @@ void ProjectSettingsEditor::_update_actions() {
Ref<InputEventKey> k = event; Ref<InputEventKey> k = event;
if (k.is_valid()) { if (k.is_valid()) {
String str = keycode_get_string(k->get_scancode()).capitalize(); const String str = keycode_get_string(k->get_scancode_with_modifiers());
if (k->get_metakey())
str = vformat("%s+", find_keycode_name(KEY_META)) + str;
if (k->get_shift())
str = TTR("Shift+") + str;
if (k->get_alt())
str = TTR("Alt+") + str;
if (k->get_control())
str = TTR("Control+") + str;
action2->set_text(0, str); action2->set_text(0, str);
action2->set_icon(0, get_icon("Keyboard", "EditorIcons")); action2->set_icon(0, get_icon("Keyboard", "EditorIcons"));

10
editor/settings_config_dialog.cpp
View File

@@ -310,15 +310,7 @@ void EditorSettingsDialog::_wait_for_key(const Ref<InputEvent> &p_event) {
if (k.is_valid() && k->is_pressed() && k->get_scancode() != 0) { if (k.is_valid() && k->is_pressed() && k->get_scancode() != 0) {
last_wait_for_key = k; last_wait_for_key = k;
String str = keycode_get_string(k->get_scancode()).capitalize(); const String str = keycode_get_string(k->get_scancode_with_modifiers());
if (k->get_metakey())
str = vformat("%s+", find_keycode_name(KEY_META)) + str;
if (k->get_shift())
str = TTR("Shift+") + str;
if (k->get_alt())
str = TTR("Alt+") + str;
if (k->get_control())
str = TTR("Control+") + str;
press_a_key_label->set_text(str); press_a_key_label->set_text(str);
press_a_key->accept_event(); press_a_key->accept_event();