godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-14 13:41:12 +00:00
Code Releases Wiki Activity

Merge pull request #100913 from larspet/tooltip-hover-oob

Browse Source 
Prevent tooltip from showing when hovering past the end of script line
This commit is contained in:
Rémi Verschelde
2025-02-07 01:39:11 +01:00
parent f0f5319b0b ff39adddd1
commit e87f4f67b0
6 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scene/gui/text_edit.cpp
View File

@@ -4370,9 +4370,12 @@ Point2 TextEdit::get_local_mouse_pos() const {
}
String TextEdit::get_word_at_pos(const Vector2 &p_pos) const {
Point2i pos = get_line_column_at_pos(p_pos);
Point2i pos = get_line_column_at_pos(p_pos, false, false);
int row = pos.y;
int col = pos.x;
if (row < 0 || col < 0) {
return "";
}
String s = text[row];
if (s.length() == 0) {
@@ -4408,7 +4411,7 @@ String TextEdit::get_word_at_pos(const Vector2 &p_pos) const {
return String();
}
Point2i TextEdit::get_line_column_at_pos(const Point2i &p_pos, bool p_allow_out_of_bounds) const {
Point2i TextEdit::get_line_column_at_pos(const Point2i &p_pos, bool p_clamp_line, bool p_clamp_column) const {
float rows = p_pos.y - theme_cache.style_normal->get_margin(SIDE_TOP);
if (!editable) {
rows -= theme_cache.style_readonly->get_offset().y / 2;
@@ -4435,10 +4438,10 @@ Point2i TextEdit::get_line_column_at_pos(const Point2i &p_pos, bool p_allow_out_
int visible_lines = get_visible_line_count_in_range(first_vis_line, row);
if (rows > visible_lines) {
if (!p_allow_out_of_bounds) {
return Point2i(-1, -1);
if (p_clamp_line) {
return Point2i(text[row].length(), row);
}
return Point2i(text[row].length(), row);
return Point2i(-1, -1);
}
int colx = p_pos.x - (theme_cache.style_normal->get_margin(SIDE_LEFT) + gutters_width + gutter_padding);
@@ -4455,6 +4458,11 @@ Point2i TextEdit::get_line_column_at_pos(const Point2i &p_pos, bool p_allow_out_
} else {
colx -= wrap_indent;
}
if (!p_clamp_column && (colx < 0 || colx > TS->shaped_text_get_size(text_rid).x)) {
return Point2i(-1, -1);
}
int col = TS->shaped_text_hit_test_position(text_rid, colx);
if (!caret_mid_grapheme_enabled) {
col = TS->shaped_text_closest_character_pos(text_rid, col);
@@ -6642,7 +6650,7 @@ void TextEdit::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_word_at_pos", "position"), &TextEdit::get_word_at_pos);
ClassDB::bind_method(D_METHOD("get_line_column_at_pos", "position", "allow_out_of_bounds"), &TextEdit::get_line_column_at_pos, DEFVAL(true));
ClassDB::bind_method(D_METHOD("get_line_column_at_pos", "position", "clamp_line", "clamp_column"), &TextEdit::get_line_column_at_pos, DEFVAL(true), DEFVAL(true));
ClassDB::bind_method(D_METHOD("get_pos_at_line_column", "line", "column"), &TextEdit::get_pos_at_line_column);
ClassDB::bind_method(D_METHOD("get_rect_at_line_column", "line", "column"), &TextEdit::get_rect_at_line_column);