Merge pull request #44935 from godotengine/revert-37769-master

Revert "solved ctrl + alt + special character Issue #6851"
This commit is contained in:
Rémi Verschelde 2021-01-05 14:59:57 +01:00 committed by GitHub
commit 118e4d3cf7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -584,7 +584,7 @@ void LineEdit::_gui_input(Ref<InputEvent> p_event) {
if (handled) { if (handled) {
accept_event(); accept_event();
} else if (!k->get_command() || (k->get_command() && k->get_alt())) { } else if (!k->get_command()) {
if (k->get_unicode() >= 32 && k->get_keycode() != KEY_DELETE) { if (k->get_unicode() >= 32 && k->get_keycode() != KEY_DELETE) {
if (editable) { if (editable) {
selection_delete(); selection_delete();

View file

@ -3619,7 +3619,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
return; return;
} }
if (!keycode_handled && (!k->get_command() || (k->get_command() && k->get_alt()))) { // For German keyboards. if (!keycode_handled && !k->get_command()) { // For German keyboards.
if (k->get_unicode() >= 32) { if (k->get_unicode() >= 32) {
if (readonly) { if (readonly) {