summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-06-21 12:02:18 +0200
committerGitHub <noreply@github.com>2016-06-21 12:02:18 +0200
commit029ca80dca135df3dcbbea517032d6842f2efc87 (patch)
tree5fed4c9a3a24e369ac3cbace35abbc9f68e90d90
parentb7b547a191ce89df25bfcc322e1305c15f149f49 (diff)
parent8f6b56cfda4ec412ae1fdd66e5e579b02211ddb2 (diff)
Merge pull request #5321 from Paulb23/caret_hidden_issue_5320
Fixed caret not drawing on focus regain
-rw-r--r--scene/gui/text_edit.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 7fbd412de8..5e18da32aa 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -1209,6 +1209,9 @@ void TextEdit::_notification(int p_what) {
} break;
case NOTIFICATION_FOCUS_ENTER: {
+ if (!caret_blink_enabled) {
+ draw_caret = true;
+ }
if (OS::get_singleton()->has_virtual_keyboard())
OS::get_singleton()->show_virtual_keyboard(get_text(),get_global_rect());