diff options
author | George Marques <george@gmarqu.es> | 2016-11-06 14:16:19 -0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-06 14:16:19 -0200 |
commit | cdc4664226cdc397d054b7390d0f75028d40412c (patch) | |
tree | 7558adebacc33191f10ce7eb022579212d4f1dbb | |
parent | 88b00cb6581832a1899ceaf6de9db0c51971099b (diff) | |
parent | 7b036a94bf9af558dab35a56a9c0b6dd8bae105b (diff) |
Merge pull request #7053 from Paulb23/caret_blink_redraw_issue_6167
Caret blink will no longer cause redraw without focus, issue 6167
-rw-r--r-- | scene/gui/line_edit.cpp | 2 | ||||
-rw-r--r-- | scene/gui/text_edit.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index f7d74b2b49..eecc730f5c 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -853,7 +853,7 @@ void LineEdit::_reset_caret_blink_timer() { void LineEdit::_toggle_draw_caret() { draw_caret = !draw_caret; - if (is_visible()) { + if (is_visible() && has_focus() && window_has_focus) { update(); } } diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index f1a2823e8f..9b3b047712 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -3458,7 +3458,7 @@ void TextEdit::_reset_caret_blink_timer() { void TextEdit::_toggle_draw_caret() { draw_caret = !draw_caret; - if (is_visible()) { + if (is_visible() && has_focus() && window_has_focus) { update(); } } |