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

Fix TextEdit.get_rect_at_line_column returning negative pos even though cursor is in viewable area of the control

This commit is contained in:
MJacred 2023-09-11 12:32:36 +02:00
parent 332bc469c4
commit 6170381bd7
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/gui/text_edit.cpp
View File

@ -1298,7 +1298,8 @@ void TextEdit::_notification(int p_what) {
if (had_glyphs_drawn) {
if (first_visible_char > glyphs[j].start) {
first_visible_char = glyphs[j].start;
} else if (last_visible_char < glyphs[j].end) {
}
if (last_visible_char < glyphs[j].end) {
last_visible_char = glyphs[j].end;
}
}
@ -4348,6 +4349,11 @@ Rect2i TextEdit::get_rect_at_line_column(int p_line, int p_column) const {
ERR_FAIL_COND_V(p_column < 0, Rect2i(-1, -1, 0, 0));
ERR_FAIL_COND_V(p_column > text[p_line].length(), Rect2i(-1, -1, 0, 0));
if (text.size() == 1 && text[0].length() == 0) {
// The TextEdit is empty.
return Rect2i();
}
if (line_drawing_cache.size() == 0 || !line_drawing_cache.has(p_line)) {
// Line is not in the cache, which means it's outside of the viewing area.
return Rect2i(-1, -1, 0, 0);

9
tests/scene/test_text_edit.h
View File

@ -3241,6 +3241,15 @@ TEST_CASE("[SceneTree][TextEdit] mouse") {
SceneTree::get_singleton()->get_root()->add_child(text_edit);
text_edit->set_size(Size2(800, 200));
CHECK(text_edit->get_rect_at_line_column(0, 0).get_position() == Point2i(0, 0));
text_edit->set_line(0, "A");
MessageQueue::get_singleton()->flush();
CHECK(text_edit->get_rect_at_line_column(0, 1).get_position().x > 0);
text_edit->clear(); // Necessary, otherwise the following test cases fail.
text_edit->set_line(0, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec vasius mattis leo, sed porta ex lacinia bibendum. Nunc bibendum pellentesque.");
MessageQueue::get_singleton()->flush();