asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #50609 from bruvzg/te_block_caret

Browse source 
[TextEdit] Improve block/insert caret drawing.
This commit is contained in:
Rémi Verschelde 2021-08-13 21:33:02 +02:00 committed by GitHub
commit 84461a5c91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
scene/gui/text_edit.cpp
View file

@ -1110,9 +1110,16 @@ void TextEdit::_notification(int p_what) {
t_caret.size.y = h;
}
t_caret.position += Vector2(char_margin + ofs_x, ofs_y);
draw_rect(t_caret, caret_color, overtype_mode);
draw_rect(t_caret, caret_color, false);
if (l_caret != Rect2() && l_dir != t_dir) {
l_caret.position += Vector2(char_margin + ofs_x, ofs_y);
l_caret.size.x = caret_width;
draw_rect(l_caret, caret_color * Color(1, 1, 1, 0.5));
}
} else { // End of the line.
if (gl_size > 0) {
// Adjust for actual line dimensions.
if (overtype_mode) {
l_caret.position.y = TS->shaped_text_get_descent(rid);
l_caret.size.y = caret_width;
@ -1120,10 +1127,20 @@ void TextEdit::_notification(int p_what) {
l_caret.position.y = -TS->shaped_text_get_ascent(rid);
l_caret.size.y = h;
}
} else if (overtype_mode) {
l_caret.position.y += l_caret.size.y;
l_caret.size.y = caret_width;
}
if (l_caret.position.x >= TS->shaped_text_get_size(rid).x) {
l_caret.size.x = font->get_char_size('m', 0, font_size).x;
} else {
l_caret.size.x = 3 * caret_width;
}
l_caret.position += Vector2(char_margin + ofs_x, ofs_y);
l_caret.size.x = font->get_char_size('M', 0, font_size).x;
draw_rect(l_caret, caret_color, false);
if (l_dir == TextServer::DIRECTION_RTL) {
l_caret.position.x -= l_caret.size.x;
}
draw_rect(l_caret, caret_color, overtype_mode);
}
} else {
// Normal caret.