godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32626 from Paulb23/issue_27631_caret_draw_eol

Browse Source 
Fixed drawing the caret at eol when at eol is not visible
This commit is contained in:
Rémi Verschelde 2019-10-07 19:18:05 +02:00 committed by GitHub
commit 667e464e64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/gui/text_edit.cpp
View File

@ -1271,7 +1271,8 @@ void TextEdit::_notification(int p_what) {
} }
// Loop through characters in one line. // Loop through characters in one line.
for (int j = 0; j < str.length(); j++) { int j = 0;
for (; j < str.length(); j++) {
if (syntax_coloring) { if (syntax_coloring) {
if (color_map.has(last_wrap_column + j)) { if (color_map.has(last_wrap_column + j)) {
@ -1501,7 +1502,7 @@ void TextEdit::_notification(int p_what) {
} }
} }
if (cursor.column == last_wrap_column + str.length() && cursor.line == line && cursor_wrap_index == line_wrap_index && (char_ofs + char_margin) >= xmargin_beg) { if (cursor.column == (last_wrap_column + j) && cursor.line == line && cursor_wrap_index == line_wrap_index && (char_ofs + char_margin) >= xmargin_beg) {
cursor_pos = Point2i(char_ofs + char_margin + ofs_x, ofs_y); cursor_pos = Point2i(char_ofs + char_margin + ofs_x, ofs_y);
cursor_pos.y += (get_row_height() - cache.font->get_height()) / 2; cursor_pos.y += (get_row_height() - cache.font->get_height()) / 2;