diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-19 12:32:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-19 12:32:13 +0200 |
| commit | 43d91faa2e0e3ea8cc554b1842829f7c7d35ee76 (patch) | |
| tree | 29302eec42ac14a491bff1d4272040e04a1e865f /scene/gui | |
| parent | c57671f0b317f31f766b54578d544cd80454335e (diff) | |
| parent | fb0e7f8f1ce68a725aa0ab716f5c004ffd72835e (diff) | |
Merge pull request #10439 from Paulb23/blinking_text_issue_10432
Fixed blinking text, issue 10432
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/text_edit.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 324c0cd0d1..2b111c50a6 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -1028,6 +1028,8 @@ void TextEdit::_notification(int p_what) { if (cursor.column == j && cursor.line == line && block_caret && draw_caret && !insert_mode) { color = cache.caret_background_color; + } else if (!syntax_coloring && block_caret) { + color = cache.font_color; } if (str[j] >= 32) { |