Merge branch 'master' of https://github.com/okamstudio/godot

2 files changed, 7 insertions, 0 deletions

diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index 22316acaba..6c9db7484b 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -79,6 +79,9 @@ void LineEdit::_input_event(InputEvent p_event) {
 				}
 				selection.creating=false;
 				selection.doubleclick=false;
+
+                // notify to show soft keyboard
+                notification(NOTIFICATION_FOCUS_ENTER);
 			}
 			
 			update();				
@@ -208,6 +211,8 @@ void LineEdit::_input_event(InputEvent p_event) {
 					case KEY_RETURN: {
 
 						emit_signal( "text_entered",text );
+                        // notify to hide soft keyboard
+                        notification(NOTIFICATION_FOCUS_EXIT);
 						return;
 					} break;
 
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 18c8c0e9f7..233e3bee66 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -857,6 +857,8 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
 			} else {
 
 				selection.selecting_mode=Selection::MODE_NONE;
+                // notify to show soft keyboard
+                notification(NOTIFICATION_FOCUS_ENTER);
 			}
 
 		} break;