summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-08-14 13:03:07 +0200
committerGitHub <noreply@github.com>2020-08-14 13:03:07 +0200
commit044b3d0ed30ce5967326e9a2b0785455dba786e5 (patch)
tree6675e49fe05ef9f837ccb006341481c49677b546
parentfac2bb99ac2143094e24a9173b77b8bee764373d (diff)
parentf412237f380d0590bed6bc89443fb6fa2bbe740d (diff)
Merge pull request #37769 from HellonLegs/master
solved ctrl + alt + special character Issue #6851
-rw-r--r--scene/gui/line_edit.cpp2
-rw-r--r--scene/gui/text_edit.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index 5afc1f438e..14167531a5 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -578,7 +578,7 @@ void LineEdit::_gui_input(Ref<InputEvent> p_event) {
if (handled) {
accept_event();
- } else if (!k->get_command()) {
+ } else if (!k->get_command() || (k->get_command() && k->get_alt())) {
if (k->get_unicode() >= 32 && k->get_keycode() != KEY_DELETE) {
if (editable) {
selection_delete();
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index e17085cafc..a17fdd0651 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -3604,7 +3604,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
return;
}
- if (!keycode_handled && !k->get_command()) { // For German keyboards.
+ if (!keycode_handled && (!k->get_command() || (k->get_command() && k->get_alt()))) { // For German keyboards.
if (k->get_unicode() >= 32) {
if (readonly) {